fixing cleanup and run