#60 Cleanup