Removed dependency on env.js