Revert "Further work on NounPhrase extractors, EntityType, Gender, Number."

This reverts commit 1b8290102197dba5cedb6211c0c71d2a4f6cc1ce.