scr/functions*: clean up