fix duplicated remove issue