Add logging

Signed-off-by: John Else <john.else@citrix.com>
Remove commented-out code

Signed-off-by: John Else <john.else@citrix.com>