Refactor remove-spotlight