class cleanup partial