[#1732] Removed "#if 0"s and "#if 1"s