Some cleanup of the bash completion code
Remove some code left over from debugging the completion script