Class clean-up