refactor: remove redundant tests from V2 and switched to f()
refactor: remove redundant code from V2
Merge pull request #201 from adamralph/51

remove redundant code from V2