Cleanup some endpoints and use the Accept header