Deprecate older scripts; Improve encapsulation of script generation