Cleaned up usage_endpoint