URI library cleanups