Refactor remove SS