Cleaned up the cleanup method.
Email does work!