More refactoring. TempEval3Dev no longer compiles