cleanup, update docs