Removed other references to URI