Removed Environment and Resources dependencies