Revert "Revert "Revert "Revert "code clean to match zabbix complete""""

This reverts commit c57cc81fb7ecaed86263c6d14c1d6c188e346595.