SSP-2465 Cleaned up ApiUrilBuilderService working version