Get rid of uivm in SP