Remove extra stuff from merge