Misc bashrc cleanups