Cleaning up some legacy version references