Help leanup (bug #2677)