remove some commented-out code - getting hard to read.