Revert "Initial Support for non complete words"

This reverts commit da898741dba4f447c97ce953959c9c716ee826df.