Clean up url joining