WIP more cleanup.