re #25 cleanup.
re #25 more cleanup