WIP some cleanup.