Removal of BaseObject class