Also clean up the env. variable definitions.

Change-Id: If51ab515d7d7d6be9b984417ce7262a83ea48a66
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>