Cleaning up files before merging branch