Remove dead code in scripts
Cleaned a bit the code