Code Review response
 - remove zenoss user
 - remove intellij comments
 - avoid printing token-id