[wip #1475] cleanup