Merge "clean and fix build error This patch is cleanup of non required code and fix...