Cleanup.
Make version checking code dumb and simple.