remove zombie code from model