Extended version

Could you remove commented code?