minor doc fix
remove unused imports
put doctests imports where they should be