Removed commented out sections.
Removed TODO item.
Using simple subject routing for now, need to evaluate the smart approach more comprehensively.