Removed some zombie code