Extended version

Could you remove this commented code? Apart from the fact it's redundant, makes reading the diffs easier...