YH-315: remove debugs and redundant code