[lib/wip] cleanup