Cleanup Script Fixes