clean up cruft, notes on rework