WL-2603 remove commented code