fix compilation error after merging with develop
remove redundant version checks. ideally, this should have been a switch statement with fallthrough checks, but the TODO block in the middle needs to be resolved before that can be done.