Revert "Adding amqp services."

This reverts commit 509ed5fe99821641e20433c66ca31e3f521d3626.
Merge branch 'master' into development
Re-adding amqp stuff.