Remove unused clients in rp3 configuration file and added them as comments
Merge remote-tracking branch 'origin/master'