Removed leftover from merge