Merge pull request #50 from willmmiles/replace-queue-v2-part1

Code cleanup prior to queue replacement

Author: mathieucarbou