Removing email class from wrong places