Cleaned up temporary classes used for testing.