diff --git a/iclicker.cpp b/iclicker.cpp
index 9808828..8d9028b 100644
--- a/iclicker.cpp
+++ b/iclicker.cpp
@@ -120,10 +120,10 @@ void MatchClickerRemotes(std::vector<Student*> &students, const std::string &rem
       continue;
     }
     assert (s != NULL);
-    if (s->getRemoteID().size() != 0) {
+    if (false) { //s->getRemoteID().size() != 0) {
       std::cout << "student " << username << " has multiple remotes (replacing a lost remote)" << std::endl;
     }
-    s->setRemoteID(remote);
+    //s->setRemoteID(remote);
     //std::cout << "MATCH " << username << " " << remote << std::endl;
     if (GLOBAL_CLICKER_MAP.find(remote) != GLOBAL_CLICKER_MAP.end()) {
       std::cout << "ERROR!  already have this clicker assigned " << remote << " " << s->getUserName() << std::endl;
diff --git a/output.cpp b/output.cpp
index 957d79f..19c5cef 100644
--- a/output.cpp
+++ b/output.cpp
@@ -1124,7 +1124,7 @@ void start_table_output( bool /*for_instructor*/,
     // ICLICKER
     if (DISPLAY_ICLICKER && ICLICKER_QUESTION_NAMES.size() > 0) {
 
-      if (this_student->getRemoteID().size() != 0) { // && this_student->hasPriorityHelpStatus()) {
+      if (false) { //this_student->getRemoteID().size() != 0) { // && this_student->hasPriorityHelpStatus()) {
         table.set(myrow,counter++,TableCell("ccccff","registered"));
         //} else if (this_student->getRemoteID() != "") {
         //table.set(myrow,counter++,TableCell("ffffff","registered"));