fixed help entries
(cherry picked from commit 9255023)
removed outdated context help
(cherry picked from commit 1396186)