Tidying up and removing some redundant elements
Added support for matching messages to consumers based on affinity to facilitate load balancing and redundancy
Added log statements back in
Removed some further redundant elements