Remove all this commented code