HSEARCH-1471 Line length and review
HSEARCH-1471 Removing obsolete zanata files
HSEARCH-1471 Removing obsolete tmp file