I would remove all this commented code.