tidy up some reset stuff