More cleanup bta6
Experimenting with equivalences