Revert "updated unit validation"

This reverts commit 10747e9690681a3503905be685aa67d07d39e6a0.