Make a sane endpoint and tie up loose ends in the api