Minor queue cleanup

Moved operions to operations package
simplified smoe methods
minor improvements
Merge pull request #3762 from pveentjer/cleanup/3.x/minor-queue-cleanup

Cleanup/3.x/minor queue cleanup