Refactor remove sets