Drop legacy environment variables

Change-Id: I560891ecce18af1c3904a5bf3159d235c3ded5ef