Various cleanup and speeding up EmailService