Got rid of old helper classes (not needed with mod-scala 0.3.0 anymore)