Cleaning up from previous merge