CP-4460: Cleanup some debug code

Signed-off-by: Zheng Li <zheng.li@eu.citrix.com>