utils cleanup, tests, docs