Remove obsolete classes

These classes were eventually superseded.