some cleanup from a while ago
start of work to collapse docs into subsections