Remove leftover files from merge