wip: more cleanup