clean up of main classes