..F....... [ZBXNEXT-1133] removed some unnecessary code and made some minor corrections