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

This reverts commit 856d0236533c7470453d85b566dfa387b9567d87.