Updated scripts
Removed TODO