Removed Environment Dependencies