May be just remove the whole commented block?