...G...... [ZBXNEXT-497] code cleanup