Consider deleting this commented block?