doc and import cleanup