Merge "Removes unused files" into release-4-6