Small improvements on auto-completion;
Remove some useless env variables.