Removed some resets