Reset some values, removed a few more