Cleanup: Remove unnecessary checks

If we get to this point we will have the build versions.
Cleanup: Use constants