Changes following "Remove geometry scvene object"