Can we get rid of this commented out block?