........S. [ZBXNEXT-1848] removed unused code; small code improvements