Cleaning up Environment variables