New classes, removed email support (not needed)