Clean up user classes