Removed extra code left from merge