Final cleanup before submission