Clean up extraneous files from merge