Fix cleanup task