Merge "Use a local list to handle removing process" into main