removing Url class - was not doing much