Post-class cleanup