Finished cleanup. All shared functionality between email and emails are in common macros.