Big cleanup...

Dipesh and I agree on this: why keep this and make the code less readable? Did someone ever used these comments ? (We can still cancel this commit if nobody agrees)