Please remove/update this commented code