Cleanup some evaluation classes