removing some un necessary code
removing the cwd portion from any error messages we send back