Removed zombie code