library cleanups