Removal of duplicate and unused classes

General code-cleanup in the E-M-P.