Clean up baseUrlPath logic