HATEOAS cleanup