cleanup some evaluation classes
Merge pull request #1475 from votjakovr/feature/gp_refactoring

Cleanup some evaluation classes