Could you remove commented code please?