Got rid off that dirty cleanupURLString function