Additional improvements, fixes and remove outdated files. Change-Id: I71cff539bb0ad32899791d658d2cf8cdef473886