WIP. Cleanup.