clean up from previous merge