Renaming
Eliminated sourcing of mms-env.sh in tool scripts