wip: more cleaning