Removes some leftovers from merge