HSEARCH-1534 Removing left over commented out code
HSEARCH-1523 Fixing unecessary include/exclude filter. Also removing Jandex as a reqiured library. It is not for this version of ORM.