CM forgot to remove commented code