Remove old base class