Remove unused env variables and adjust the aliases