more class cleanup