class clean up