scr/ipr: clean up