cleanup class stuff