work towards validity
Revert "work towards validity"

This reverts commit 0ac8ed7a42cedc17e2ca5ca73d5321e17a1a597d.
validity!