Removed unused constructors
Restricted the visibility of evaluation implementation methods
Reverted commit ce701a73ae