Merge repair
Final cleanup