Fix removeSelf