removing files to prepare for merge