URI cleanup