DOC + minor cruft removal