Remove cruft, add /services/{service} endpoint