Removed use of os environment variables