Remove missed stuff from merge