More cleanup to address Help Clarification