Port a reset method and remove some TODO comments