removes further needless checks
Revert "more use of FVC"

This reverts commit 71218a5da1b1540165ac7081edc130d9201ceaf2.