r1802 + remove the last ends of help code and data