More bashrc cleanup