Scripted/Misc: Some cleanup