fixed cleanup