BaseObject cleanup