Remove old base class in support of refactoring