Remove unused code from raw context
Fixes #6