remove unused files created in previous merge