Removed some classes as they are part of Josef (under a slightly different name).
Authored by: keess 2015-04-15
Parent: [r2723]
Child: [r2725]
