Remove legacy object creation mode, and convert remaining uses of it