merge file deletions from refactoring