Cleaning up some more of scripting pieces