Remove New URI class and tests