Scripts consolidated where possible and unused scripts removed