Scripting/Misc: Some cleanup.