fixed cleanup scripts