Commit 4b3d0c6600 has removed them, but did not remove few traces in documentation and help. Remove them from remaining places. (cherry picked from commit 65b9eeb39a)
4b3d0c6600
65b9eeb39a