Further cleanup of .bashrc