Cleanup/3.x/minor queue cleanup