Remove all version checking stuff and update code