utility cleanup and docs