Final cleanup before merge