Remove dependency on base class