Endpoint parsing cleanup