All email features are no longer time sensitive: clean up code