Upgrade to new hgapp structure.
Remove redundant env variable.