Delete some legacy stuff from merge