get rid of zombie code