Added 'unenrollment' feature