Clean up class definitions.