Revert "Assumptions work, cleanup"

This reverts commit 9d5799dbc13068b392d7eb405505854ea10179ac.