Cleanup.
WIP