Updates to remove Mac path add from main file, and adding
command not found unset for Ubuntu machines.