Remove more references to intobject.
8 files changed