wip: api: clean up small