Cleanup.
Magic commit! Fix all the things!