Removing emailing code and cleaning up old design.