cleanup old code with emails