Eliminate unnecessary version checks