Cleanup #2.