Cleanup location of version check per pull request comments for SYNC-284