Scripts/Misc: Some cleanups