Cleaning up class files