cleanup class generation