Remove unused base class