Can we remove this commented out block?