Swizzle dealloc

More reliable automatic cleanup by swizzling dealloc