Fix cleanup again.