Fix cleanup