[wip] Clean this up. [ci skip]