Add bash completion and remove optionals