Removed some evaluation classes