Clean up of classes