Remove own version of count-words

Change-Id: I8a1edb5e67f931384ea03643f7eba2fcf978d99e
update

Change-Id: I680a4b79fcd590a9094c3b2cb2cc18a9c2284330