removeSpi now throws RTEs instead of swallowing exceptions