Class clean up