Some zombie code removed