One more class to clean up