Removal of word search from all code