Further cleaning up various environemnts variables