Deleting previously #if 0'ed stuff.