Remove persistent handle wrapping for context