Revert "Reset"

This reverts commit 66e6568bbab3951bb8bf058f2c1151df2cfeb1da.
more cleanup