cleanup in classes