Dependency cleanup


 - https://hibernate.atlassian.net/browse/HSEARCH-1510
 - https://hibernate.atlassian.net/browse/HSEARCH-1523