Update docs generation to populate correct docs, remove redundant docs

Update docs generation to populate correct docs, remove redundant docs #2020