Remove redundant files (leftover from merge)