cut some cruft, restructure