Remove linkActionHelper reset and address other suggestion