Strip out unwanted chan call for HATEOAS set up and also tidy up a couple of other chan returns.