Cleanup
I wish I had a clear test case for this.