[wip] cleanup