Cleaning up internal refs.
Initial work into refactoring context data store.