Added removing slave facility