Final cleanup for submission