Ensuring we clean up context data