Remove this commented code please