Remove commented out code
Remove line in queue.yaml
Rework config to use standard default behavior
Add in completion config related tests