tidying up long options
removing useless environment variables