Cleanup.
Cleanup #2