Clean up class methods