email class, general admin cleanup