wip: cleanup