ENYO-2771: remove debug/dead code