Cleanup #4.