fix leader selection bug & remove no used stops