class cleanup