Remove need for raw session inspect