Fix cleanup.