dead code--
Remove Context class
doc++
clean ups