Removed dead weight from old eval mechanism.
Removed dead weight from old eval mechanism.

gcfavorites/hiccup,muspellsson/hiccup,tolysz/hiccup,gcfavorites/hiccup,tolysz/hiccup,strepo/hiccup,strepo/hiccup,muspellsson/hiccup