Comment cleanups. Old code removals.