WIP: Cleaning up.