[wip] Clean up.