Remove obsolete classes

These classes were eventually superseded.
Merge pull request #33 from zonama-sekot/remove-obsolete-classes

Remove obsolete classes