doc fix and import cleanup