Remove the old '#if 0' code