Again remove .bash_completion and consolidate completion logic into .bashrc.