Fix headers. Cleanup.