Clean up some of the reset methods