diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
index 721d449c..aae7ba88 100755
--- a/src/audiomixerboard.cpp
+++ b/src/audiomixerboard.cpp
@@ -134,10 +134,6 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags f ) : QFra
     QObject::connect(vecpChanFader[3],SIGNAL(valueChanged(double)),this,SLOT(OnValueChangedCh3(double)));
     QObject::connect(vecpChanFader[4],SIGNAL(valueChanged(double)),this,SLOT(OnValueChangedCh4(double)));
     QObject::connect(vecpChanFader[5],SIGNAL(valueChanged(double)),this,SLOT(OnValueChangedCh5(double)));
-    QObject::connect(vecpChanFader[6],SIGNAL(valueChanged(double)),this,SLOT(OnValueChangedCh6(double)));
-    QObject::connect(vecpChanFader[7],SIGNAL(valueChanged(double)),this,SLOT(OnValueChangedCh7(double)));
-    QObject::connect(vecpChanFader[8],SIGNAL(valueChanged(double)),this,SLOT(OnValueChangedCh8(double)));
-    QObject::connect(vecpChanFader[9],SIGNAL(valueChanged(double)),this,SLOT(OnValueChangedCh9(double)));
 }
 
 void CAudioMixerBoard::HideAll()
diff --git a/src/audiomixerboard.h b/src/audiomixerboard.h
index 2dde087f..c5aba03d 100755
--- a/src/audiomixerboard.h
+++ b/src/audiomixerboard.h
@@ -105,10 +105,6 @@ public slots:
     void OnValueChangedCh3 ( double dValue ) { emit ChangeChanGain ( 3, dValue ); }
     void OnValueChangedCh4 ( double dValue ) { emit ChangeChanGain ( 4, dValue ); }
     void OnValueChangedCh5 ( double dValue ) { emit ChangeChanGain ( 5, dValue ); }
-    void OnValueChangedCh6 ( double dValue ) { emit ChangeChanGain ( 6, dValue ); }
-    void OnValueChangedCh7 ( double dValue ) { emit ChangeChanGain ( 7, dValue ); }
-    void OnValueChangedCh8 ( double dValue ) { emit ChangeChanGain ( 8, dValue ); }
-    void OnValueChangedCh9 ( double dValue ) { emit ChangeChanGain ( 9, dValue ); }
 
 signals:
     void ChangeChanGain ( int iId, double dGain );
diff --git a/src/channel.cpp b/src/channel.cpp
index 5bbc2858..398aa54f 100755
--- a/src/channel.cpp
+++ b/src/channel.cpp
@@ -45,10 +45,6 @@ CChannelSet::CChannelSet()
     QObject::connect(&vecChannels[3],SIGNAL(MessReadyForSending(CVector<uint8_t>)),this,SLOT(OnSendProtMessCh3(CVector<uint8_t>)));
     QObject::connect(&vecChannels[4],SIGNAL(MessReadyForSending(CVector<uint8_t>)),this,SLOT(OnSendProtMessCh4(CVector<uint8_t>)));
     QObject::connect(&vecChannels[5],SIGNAL(MessReadyForSending(CVector<uint8_t>)),this,SLOT(OnSendProtMessCh5(CVector<uint8_t>)));
-    QObject::connect(&vecChannels[6],SIGNAL(MessReadyForSending(CVector<uint8_t>)),this,SLOT(OnSendProtMessCh6(CVector<uint8_t>)));
-    QObject::connect(&vecChannels[7],SIGNAL(MessReadyForSending(CVector<uint8_t>)),this,SLOT(OnSendProtMessCh7(CVector<uint8_t>)));
-    QObject::connect(&vecChannels[8],SIGNAL(MessReadyForSending(CVector<uint8_t>)),this,SLOT(OnSendProtMessCh8(CVector<uint8_t>)));
-    QObject::connect(&vecChannels[9],SIGNAL(MessReadyForSending(CVector<uint8_t>)),this,SLOT(OnSendProtMessCh9(CVector<uint8_t>)));
 
     // request jitter buffer size
     QObject::connect(&vecChannels[0],SIGNAL(NewConnection()),this,SLOT(OnNewConnectionCh0()));
@@ -57,10 +53,6 @@ CChannelSet::CChannelSet()
     QObject::connect(&vecChannels[3],SIGNAL(NewConnection()),this,SLOT(OnNewConnectionCh3()));
     QObject::connect(&vecChannels[4],SIGNAL(NewConnection()),this,SLOT(OnNewConnectionCh4()));
     QObject::connect(&vecChannels[5],SIGNAL(NewConnection()),this,SLOT(OnNewConnectionCh5()));
-    QObject::connect(&vecChannels[6],SIGNAL(NewConnection()),this,SLOT(OnNewConnectionCh6()));
-    QObject::connect(&vecChannels[7],SIGNAL(NewConnection()),this,SLOT(OnNewConnectionCh7()));
-    QObject::connect(&vecChannels[8],SIGNAL(NewConnection()),this,SLOT(OnNewConnectionCh8()));
-    QObject::connect(&vecChannels[9],SIGNAL(NewConnection()),this,SLOT(OnNewConnectionCh9()));
 
     // request connected clients list
     QObject::connect(&vecChannels[0],SIGNAL(ReqConnClientsList()),this,SLOT(OnReqConnClientsListCh0()));
@@ -69,10 +61,6 @@ CChannelSet::CChannelSet()
     QObject::connect(&vecChannels[3],SIGNAL(ReqConnClientsList()),this,SLOT(OnReqConnClientsListCh3()));
     QObject::connect(&vecChannels[4],SIGNAL(ReqConnClientsList()),this,SLOT(OnReqConnClientsListCh4()));
     QObject::connect(&vecChannels[5],SIGNAL(ReqConnClientsList()),this,SLOT(OnReqConnClientsListCh5()));
-    QObject::connect(&vecChannels[6],SIGNAL(ReqConnClientsList()),this,SLOT(OnReqConnClientsListCh6()));
-    QObject::connect(&vecChannels[7],SIGNAL(ReqConnClientsList()),this,SLOT(OnReqConnClientsListCh7()));
-    QObject::connect(&vecChannels[8],SIGNAL(ReqConnClientsList()),this,SLOT(OnReqConnClientsListCh8()));
-    QObject::connect(&vecChannels[9],SIGNAL(ReqConnClientsList()),this,SLOT(OnReqConnClientsListCh9()));
 
     // channel name has changed
     QObject::connect(&vecChannels[0],SIGNAL(NameHasChanged()),this,SLOT(OnNameHasChangedCh0()));
@@ -81,10 +69,6 @@ CChannelSet::CChannelSet()
     QObject::connect(&vecChannels[3],SIGNAL(NameHasChanged()),this,SLOT(OnNameHasChangedCh3()));
     QObject::connect(&vecChannels[4],SIGNAL(NameHasChanged()),this,SLOT(OnNameHasChangedCh4()));
     QObject::connect(&vecChannels[5],SIGNAL(NameHasChanged()),this,SLOT(OnNameHasChangedCh5()));
-    QObject::connect(&vecChannels[6],SIGNAL(NameHasChanged()),this,SLOT(OnNameHasChangedCh6()));
-    QObject::connect(&vecChannels[7],SIGNAL(NameHasChanged()),this,SLOT(OnNameHasChangedCh7()));
-    QObject::connect(&vecChannels[8],SIGNAL(NameHasChanged()),this,SLOT(OnNameHasChangedCh8()));
-    QObject::connect(&vecChannels[9],SIGNAL(NameHasChanged()),this,SLOT(OnNameHasChangedCh9()));
 }
 
 CVector<CChannelShortInfo> CChannelSet::CreateChannelList()
diff --git a/src/channel.h b/src/channel.h
index 4d594567..8960830b 100755
--- a/src/channel.h
+++ b/src/channel.h
@@ -253,10 +253,6 @@ public slots:
     void OnSendProtMessCh3(CVector<uint8_t> mess) {emit MessReadyForSending(3,mess);}
     void OnSendProtMessCh4(CVector<uint8_t> mess) {emit MessReadyForSending(4,mess);}
     void OnSendProtMessCh5(CVector<uint8_t> mess) {emit MessReadyForSending(5,mess);}
-    void OnSendProtMessCh6(CVector<uint8_t> mess) {emit MessReadyForSending(6,mess);}
-    void OnSendProtMessCh7(CVector<uint8_t> mess) {emit MessReadyForSending(7,mess);}
-    void OnSendProtMessCh8(CVector<uint8_t> mess) {emit MessReadyForSending(8,mess);}
-    void OnSendProtMessCh9(CVector<uint8_t> mess) {emit MessReadyForSending(9,mess);}
 
     void OnNewConnectionCh0() {vecChannels[0].CreateReqJitBufMes();}
     void OnNewConnectionCh1() {vecChannels[1].CreateReqJitBufMes();}
@@ -264,10 +260,6 @@ public slots:
     void OnNewConnectionCh3() {vecChannels[3].CreateReqJitBufMes();}
     void OnNewConnectionCh4() {vecChannels[4].CreateReqJitBufMes();}
     void OnNewConnectionCh5() {vecChannels[5].CreateReqJitBufMes();}
-    void OnNewConnectionCh6() {vecChannels[6].CreateReqJitBufMes();}
-    void OnNewConnectionCh7() {vecChannels[7].CreateReqJitBufMes();}
-    void OnNewConnectionCh8() {vecChannels[8].CreateReqJitBufMes();}
-    void OnNewConnectionCh9() {vecChannels[9].CreateReqJitBufMes();}
 
     void OnReqConnClientsListCh0() { CreateAndSendChanListForThisChan ( 0 ); }
     void OnReqConnClientsListCh1() { CreateAndSendChanListForThisChan ( 1 ); }
@@ -275,10 +267,6 @@ public slots:
     void OnReqConnClientsListCh3() { CreateAndSendChanListForThisChan ( 3 ); }
     void OnReqConnClientsListCh4() { CreateAndSendChanListForThisChan ( 4 ); }
     void OnReqConnClientsListCh5() { CreateAndSendChanListForThisChan ( 5 ); }
-    void OnReqConnClientsListCh6() { CreateAndSendChanListForThisChan ( 6 ); }
-    void OnReqConnClientsListCh7() { CreateAndSendChanListForThisChan ( 7 ); }
-    void OnReqConnClientsListCh8() { CreateAndSendChanListForThisChan ( 8 ); }
-    void OnReqConnClientsListCh9() { CreateAndSendChanListForThisChan ( 9 ); }
 
     void OnNameHasChangedCh0() { CreateAndSendChanListForAllConChannels(); }
     void OnNameHasChangedCh1() { CreateAndSendChanListForAllConChannels(); }
@@ -286,10 +274,6 @@ public slots:
     void OnNameHasChangedCh3() { CreateAndSendChanListForAllConChannels(); }
     void OnNameHasChangedCh4() { CreateAndSendChanListForAllConChannels(); }
     void OnNameHasChangedCh5() { CreateAndSendChanListForAllConChannels(); }
-    void OnNameHasChangedCh6() { CreateAndSendChanListForAllConChannels(); }
-    void OnNameHasChangedCh7() { CreateAndSendChanListForAllConChannels(); }
-    void OnNameHasChangedCh8() { CreateAndSendChanListForAllConChannels(); }
-    void OnNameHasChangedCh9() { CreateAndSendChanListForAllConChannels(); }
 
 signals:
     void MessReadyForSending ( int iChID, CVector<uint8_t> vecMessage );
diff --git a/src/global.h b/src/global.h
index e4e5847d..dc0d7543 100755
--- a/src/global.h
+++ b/src/global.h
@@ -85,7 +85,7 @@
 // if you want to change this paramter, there has to be done code modifications
 // on other places, too! The code tag "MAX_NUM_CHANNELS_TAG" shows these places
 // (just search for the tag in the entire code)
-#define MAX_NUM_CHANNELS                10 // max number channels for server
+#define MAX_NUM_CHANNELS                6 // max number channels for server
 
 // sample rate offset estimation algorithm
 // time interval for sample rate offset estimation