Removed use of CountOutputWalker

Removed use of CountOutputWalker (performance issue)