Remove duplicate code resulting from previous merge