Eric Pouech : Removed some dead-code.