remove unused files
removed failed quick merge set