Remove some unnecessary code.
Assessments new route.

(Hand merged from assessments branch)