Merge "Remove legacy make env variables"