Tweak the queue worker refactor.

Remove commented out code