inline scripts removed.
Merge branch 'refactor-scripting'