cleanup calls to script functions, use <SID>