Let the build tool handle version stuff

And minor code tweak to remove unnecessary check