More removal of "#if 0" content.
6 files changed