Final cleanup
Final cleanup #2