Removed environment dependencies (for real this time)