support removing a context
minor refactoring
Only include node properties if they are available, otherwise ommit (via TheSeeker)