cleanup for merge
remove unwanted files