Clean up minimum version to just MAJOR >= 2