Improved clearing of taphold state