bashrc: changes to environment variables and cleanup