Cleanup WIP.