remove use of base class