more cleanup
fix double reset