Doc: cleaned up a few files to better suit doc info model
Merge branch 'docTopicCleanup'