get rid of ridiculous and completely unnecessary base class