Strip some old logging.
Moce asset comparator into static inner class.
Some tidying up.
Merge Data Channel branch.