remove requirement to set cqlVersion explicitly; fix cqlVersion check to be 'or' instead of 'and'