Remove tapCount and analyzer