Added remove slave feature