Development/Editra: Script cleanup