Cleanup stuff

I'm wary that not setting this to `null` can cause an infinite loop. I'll write a test or see what exists.