Revert "rip more out"

This reverts commit 7f5c13512cfed4f7f751cdcbd1aea7b8c22afcc0.
Revert "tidy some things"

This reverts commit ead71f4f8ee3f29fdf2da5160b63aabda48a2f44.
Revert "consolidate further"

This reverts commit 98f4c72f299b9492f44f7144a1d510112fdaef7f.