Index: trunk/BNC/src/combination/bnccomb.cpp
===================================================================
--- trunk/BNC/src/combination/bnccomb.cpp	(revision 10611)
+++ trunk/BNC/src/combination/bnccomb.cpp	(revision 10612)
@@ -1005,9 +1005,4 @@
         << " Maximum Residuum " << maxRes << ' '
         << corrs(sys)[maxResIndex-1]->_acName << ' ' << corrs(sys)[maxResIndex-1]->_prn.mid(0,3);
-    double facSys = 1.0;
-    if (sys == 'C' &&
-        corrs(sys)[maxResIndex-1]->_prn.mid(1,2).toInt() <= 16) {// BDS-2
-      facSys *= 2.0;
-    }
     if (maxRes > _MAX_RES) {
       for (int iPar = 1; iPar <= _params[sys].size(); iPar++) {
@@ -1464,5 +1459,6 @@
     }
     else {
-      if ( corr->_eph == ephLast || corr->_eph == ephPrev ) {
+      if ( corr->_eph == ephLast ||
+           corr->_eph == ephPrev ) {
         switchToLastEph(ephLast, corr);
       }
@@ -1543,10 +1539,5 @@
       else if (corr == maxDiff[prn]) {
         double norm = corr->_diffRao.NormFrobenius();
-        double facSys = 1.0;
-        if (sys == 'C' &&
-            prn.mid(1,2).toInt() <= 16) {// BDS-2
-          facSys *= 5.0;
-        }
-        if (norm > (_MAX_DISPLACEMENT * facSys)) {
+        if (norm > (_MAX_DISPLACEMENT)) {
           out << epoTime.datestr().c_str()    << " "
               << epoTime.timestr().c_str()    << " "