Clean up HClass