add context release
fix todo