imports cleanup.
Fixed KVO issue with new document architecture.