Clean up from previous bad merges