Update scripts
Cleanup