Bastion: Removing moved files leftover from merge.