drop some cruft
minor todo edits