remove some unused vars
fix connecting interface
Merge branch 'multiCSource'