Remove reference to caching
Clean up some mailer stuff