FEAT_3767 Remove master slave