Direct remove instead of defer
Fix bash completion script