Remove CountOptimized