incomplete updates -- more to do
remove some dependencies on doc2