uncommented final cleanup