If all these commented-out lines around here are not used any more then remove them.