Cleanup #1.