Merge "Removing unused function reset()"