Polishing; PR Comments

Also, remove channels map from the MessageBusAwareChannelResolver.