[wip] more cleanup