Removes deprecated environment options
Minor project refactor