Remove unnecessary base class