Transpile 91b572b3

contracts/mocks/EIP712ExternalUpgradeable.sol

@@ -12,7 +12,7 @@ contract EIP712ExternalUpgradeable is Initializable, EIP712Upgradeable {
         __EIP712External_init_unchained(name, version);
     }
 
-    function __EIP712External_init_unchained(string memory name, string memory version) internal onlyInitializing {}
+    function __EIP712External_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function domainSeparator() external view returns (bytes32) {
         return _domainSeparatorV4();

contracts/mocks/ERC1155BurnableMockUpgradeable.sol

@@ -14,7 +14,7 @@ contract ERC1155BurnableMockUpgradeable is Initializable, ERC1155BurnableUpgrade
         __ERC1155BurnableMock_init_unchained(uri);
     }
 
-    function __ERC1155BurnableMock_init_unchained(string memory uri) internal onlyInitializing {}
+    function __ERC1155BurnableMock_init_unchained(string memory) internal onlyInitializing {}
 
     function mint(
         address to,

contracts/mocks/ERC1155MockUpgradeable.sol

@@ -17,7 +17,7 @@ contract ERC1155MockUpgradeable is Initializable, ERC1155Upgradeable {
         __ERC1155Mock_init_unchained(uri);
     }
 
-    function __ERC1155Mock_init_unchained(string memory uri) internal onlyInitializing {}
+    function __ERC1155Mock_init_unchained(string memory) internal onlyInitializing {}
 
     function setURI(string memory newuri) public {
         _setURI(newuri);

contracts/mocks/ERC1155PausableMockUpgradeable.sol

@@ -17,7 +17,7 @@ contract ERC1155PausableMockUpgradeable is Initializable, ERC1155MockUpgradeable
         __ERC1155PausableMock_init_unchained(uri);
     }
 
-    function __ERC1155PausableMock_init_unchained(string memory uri) internal onlyInitializing {}
+    function __ERC1155PausableMock_init_unchained(string memory) internal onlyInitializing {}
 
     function pause() external {
         _pause();

contracts/mocks/ERC1155SupplyMockUpgradeable.sol

@@ -16,7 +16,7 @@ contract ERC1155SupplyMockUpgradeable is Initializable, ERC1155MockUpgradeable,
         __ERC1155SupplyMock_init_unchained(uri);
     }
 
-    function __ERC1155SupplyMock_init_unchained(string memory uri) internal onlyInitializing {}
+    function __ERC1155SupplyMock_init_unchained(string memory) internal onlyInitializing {}
 
     function _beforeTokenTransfer(
         address operator,

contracts/mocks/ERC20BurnableMockUpgradeable.sol

@@ -19,8 +19,8 @@ contract ERC20BurnableMockUpgradeable is Initializable, ERC20BurnableUpgradeable
     }
 
     function __ERC20BurnableMock_init_unchained(
-        string memory name,
-        string memory symbol,
+        string memory,
+        string memory,
         address initialAccount,
         uint256 initialBalance
     ) internal onlyInitializing {

contracts/mocks/ERC20CappedMockUpgradeable.sol

@@ -18,9 +18,9 @@ contract ERC20CappedMockUpgradeable is Initializable, ERC20CappedUpgradeable {
     }
 
     function __ERC20CappedMock_init_unchained(
-        string memory name,
-        string memory symbol,
-        uint256 cap
+        string memory,
+        string memory,
+        uint256
     ) internal onlyInitializing {}
 
     function mint(address to, uint256 tokenId) public {

contracts/mocks/ERC20DecimalsMockUpgradeable.sol

@@ -19,8 +19,8 @@ contract ERC20DecimalsMockUpgradeable is Initializable, ERC20Upgradeable {
     }
 
     function __ERC20DecimalsMock_init_unchained(
-        string memory name_,
-        string memory symbol_,
+        string memory,
+        string memory,
         uint8 decimals_
     ) internal onlyInitializing {
         _decimals = decimals_;

contracts/mocks/ERC20FlashMintMockUpgradeable.sol

@@ -19,8 +19,8 @@ contract ERC20FlashMintMockUpgradeable is Initializable, ERC20FlashMintUpgradeab
     }
 
     function __ERC20FlashMintMock_init_unchained(
-        string memory name,
-        string memory symbol,
+        string memory,
+        string memory,
         address initialAccount,
         uint256 initialBalance
     ) internal onlyInitializing {

contracts/mocks/ERC20MockUpgradeable.sol

@@ -19,8 +19,8 @@ contract ERC20MockUpgradeable is Initializable, ERC20Upgradeable {
     }
 
     function __ERC20Mock_init_unchained(
-        string memory name,
-        string memory symbol,
+        string memory,
+        string memory,
         address initialAccount,
         uint256 initialBalance
     ) internal onlyInitializing {

contracts/mocks/ERC20PausableMockUpgradeable.sol

@@ -21,8 +21,8 @@ contract ERC20PausableMockUpgradeable is Initializable, ERC20PausableUpgradeable
     }
 
     function __ERC20PausableMock_init_unchained(
-        string memory name,
-        string memory symbol,
+        string memory,
+        string memory,
         address initialAccount,
         uint256 initialBalance
     ) internal onlyInitializing {

contracts/mocks/ERC20PermitMockUpgradeable.sol

@@ -20,8 +20,8 @@ contract ERC20PermitMockUpgradeable is Initializable, ERC20PermitUpgradeable {
     }
 
     function __ERC20PermitMock_init_unchained(
-        string memory name,
-        string memory symbol,
+        string memory,
+        string memory,
         address initialAccount,
         uint256 initialBalance
     ) internal onlyInitializing {

contracts/mocks/ERC20SnapshotMockUpgradeable.sol

@@ -19,8 +19,8 @@ contract ERC20SnapshotMockUpgradeable is Initializable, ERC20SnapshotUpgradeable
     }
 
     function __ERC20SnapshotMock_init_unchained(
-        string memory name,
-        string memory symbol,
+        string memory,
+        string memory,
         address initialAccount,
         uint256 initialBalance
     ) internal onlyInitializing {

contracts/mocks/ERC20VotesCompMockUpgradeable.sol

@@ -16,7 +16,7 @@ contract ERC20VotesCompMockUpgradeable is Initializable, ERC20VotesCompUpgradeab
         __ERC20VotesCompMock_init_unchained(name, symbol);
     }
 
-    function __ERC20VotesCompMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
+    function __ERC20VotesCompMock_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function mint(address account, uint256 amount) public {
         _mint(account, amount);

contracts/mocks/ERC20VotesMockUpgradeable.sol

@@ -15,7 +15,7 @@ contract ERC20VotesMockUpgradeable is Initializable, ERC20VotesUpgradeable {
         __ERC20VotesMock_init_unchained(name, symbol);
     }
 
-    function __ERC20VotesMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
+    function __ERC20VotesMock_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function mint(address account, uint256 amount) public {
         _mint(account, amount);

contracts/mocks/ERC20WrapperMockUpgradeable.sol

@@ -18,9 +18,9 @@ contract ERC20WrapperMockUpgradeable is Initializable, ERC20WrapperUpgradeable {
     }
 
     function __ERC20WrapperMock_init_unchained(
-        IERC20Upgradeable _underlyingToken,
-        string memory name,
-        string memory symbol
+        IERC20Upgradeable,
+        string memory,
+        string memory
     ) internal onlyInitializing {}
 
     function recover(address account) public returns (uint256) {

contracts/mocks/ERC721BurnableMockUpgradeable.sol

@@ -14,7 +14,7 @@ contract ERC721BurnableMockUpgradeable is Initializable, ERC721BurnableUpgradeab
         __ERC721BurnableMock_init_unchained(name, symbol);
     }
 
-    function __ERC721BurnableMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
+    function __ERC721BurnableMock_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function exists(uint256 tokenId) public view returns (bool) {
         return _exists(tokenId);

contracts/mocks/ERC721EnumerableMockUpgradeable.sol

@@ -20,7 +20,7 @@ contract ERC721EnumerableMockUpgradeable is Initializable, ERC721EnumerableUpgra
         __ERC721EnumerableMock_init_unchained(name, symbol);
     }
 
-    function __ERC721EnumerableMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
+    function __ERC721EnumerableMock_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function _baseURI() internal view virtual override returns (string memory) {
         return _baseTokenURI;

contracts/mocks/ERC721MockUpgradeable.sol

@@ -17,7 +17,7 @@ contract ERC721MockUpgradeable is Initializable, ERC721Upgradeable {
         __ERC721Mock_init_unchained(name, symbol);
     }
 
-    function __ERC721Mock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
+    function __ERC721Mock_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function baseURI() public view returns (string memory) {
         return _baseURI();

contracts/mocks/ERC721PausableMockUpgradeable.sol

@@ -19,7 +19,7 @@ contract ERC721PausableMockUpgradeable is Initializable, ERC721PausableUpgradeab
         __ERC721PausableMock_init_unchained(name, symbol);
     }
 
-    function __ERC721PausableMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
+    function __ERC721PausableMock_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function pause() external {
         _pause();

contracts/mocks/ERC721RoyaltyMockUpgradeable.sol

@@ -15,7 +15,7 @@ contract ERC721RoyaltyMockUpgradeable is Initializable, ERC721RoyaltyUpgradeable
         __ERC721RoyaltyMock_init_unchained(name, symbol);
     }
 
-    function __ERC721RoyaltyMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
+    function __ERC721RoyaltyMock_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function setTokenRoyalty(
         uint256 tokenId,

contracts/mocks/ERC721URIStorageMockUpgradeable.sol

@@ -20,7 +20,7 @@ contract ERC721URIStorageMockUpgradeable is Initializable, ERC721URIStorageUpgra
         __ERC721URIStorageMock_init_unchained(name, symbol);
     }
 
-    function __ERC721URIStorageMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
+    function __ERC721URIStorageMock_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function _baseURI() internal view virtual override returns (string memory) {
         return _baseTokenURI;

contracts/mocks/ERC721VotesMockUpgradeable.sol

@@ -16,7 +16,7 @@ contract ERC721VotesMockUpgradeable is Initializable, ERC721VotesUpgradeable {
         __ERC721VotesMock_init_unchained(name, symbol);
     }
 
-    function __ERC721VotesMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
+    function __ERC721VotesMock_init_unchained(string memory, string memory) internal onlyInitializing {}
 
     function getTotalSupply() public view returns (uint256) {
         return _getTotalSupply();

contracts/mocks/ERC777MockUpgradeable.sol

@@ -24,9 +24,9 @@ contract ERC777MockUpgradeable is Initializable, ContextUpgradeable, ERC777Upgra
     function __ERC777Mock_init_unchained(
         address initialHolder,
         uint256 initialBalance,
-        string memory name,
-        string memory symbol,
-        address[] memory defaultOperators
+        string memory,
+        string memory,
+        address[] memory
     ) internal onlyInitializing {
         _mint(initialHolder, initialBalance, "", "");
     }

contracts/mocks/GovernorCompMockUpgradeable.sol

@@ -18,7 +18,7 @@ contract GovernorCompMockUpgradeable is Initializable, GovernorVotesCompUpgradea
         __GovernorCompMock_init_unchained(name_, token_);
     }
 
-    function __GovernorCompMock_init_unchained(string memory name_, ERC20VotesCompUpgradeable token_) internal onlyInitializing {}
+    function __GovernorCompMock_init_unchained(string memory, ERC20VotesCompUpgradeable) internal onlyInitializing {}
 
     function quorum(uint256) public pure override returns (uint256) {
         return 0;

contracts/mocks/GovernorCompatibilityBravoMockUpgradeable.sol

@@ -37,12 +37,12 @@ contract GovernorCompatibilityBravoMockUpgradeable is
     }
 
     function __GovernorCompatibilityBravoMock_init_unchained(
-        string memory name_,
-        ERC20VotesCompUpgradeable token_,
-        uint256 votingDelay_,
-        uint256 votingPeriod_,
-        uint256 proposalThreshold_,
-        ICompoundTimelockUpgradeable timelock_
+        string memory,
+        ERC20VotesCompUpgradeable,
+        uint256,
+        uint256,
+        uint256,
+        ICompoundTimelockUpgradeable
     ) internal onlyInitializing {}
 
     function supportsInterface(bytes4 interfaceId)

contracts/mocks/GovernorMockUpgradeable.sol

@@ -35,11 +35,11 @@ contract GovernorMockUpgradeable is
     }
 
     function __GovernorMock_init_unchained(
-        string memory name_,
-        IVotesUpgradeable token_,
-        uint256 votingDelay_,
-        uint256 votingPeriod_,
-        uint256 quorumNumerator_
+        string memory,
+        IVotesUpgradeable,
+        uint256,
+        uint256,
+        uint256
     ) internal onlyInitializing {}
 
     function cancel(

contracts/mocks/GovernorPreventLateQuorumMockUpgradeable.sol

@@ -37,12 +37,12 @@ contract GovernorPreventLateQuorumMockUpgradeable is
     }
 
     function __GovernorPreventLateQuorumMock_init_unchained(
-        string memory name_,
-        IVotesUpgradeable token_,
-        uint256 votingDelay_,
-        uint256 votingPeriod_,
+        string memory,
+        IVotesUpgradeable,
+        uint256,
+        uint256,
         uint256 quorum_,
-        uint64 voteExtension_
+        uint64
     ) internal onlyInitializing {
         _quorum = quorum_;
     }

contracts/mocks/GovernorTimelockCompoundMockUpgradeable.sol

@@ -37,12 +37,12 @@ contract GovernorTimelockCompoundMockUpgradeable is
     }
 
     function __GovernorTimelockCompoundMock_init_unchained(
-        string memory name_,
-        IVotesUpgradeable token_,
-        uint256 votingDelay_,
-        uint256 votingPeriod_,
-        ICompoundTimelockUpgradeable timelock_,
-        uint256 quorumNumerator_
+        string memory,
+        IVotesUpgradeable,
+        uint256,
+        uint256,
+        ICompoundTimelockUpgradeable,
+        uint256
     ) internal onlyInitializing {}
 
     function supportsInterface(bytes4 interfaceId)

contracts/mocks/GovernorTimelockControlMockUpgradeable.sol

@@ -37,12 +37,12 @@ contract GovernorTimelockControlMockUpgradeable is
     }
 
     function __GovernorTimelockControlMock_init_unchained(
-        string memory name_,
-        IVotesUpgradeable token_,
-        uint256 votingDelay_,
-        uint256 votingPeriod_,
-        TimelockControllerUpgradeable timelock_,
-        uint256 quorumNumerator_
+        string memory,
+        IVotesUpgradeable,
+        uint256,
+        uint256,
+        TimelockControllerUpgradeable,
+        uint256
     ) internal onlyInitializing {}
 
     function supportsInterface(bytes4 interfaceId)

contracts/mocks/GovernorVoteMockUpgradeable.sol

@@ -18,7 +18,7 @@ contract GovernorVoteMocksUpgradeable is Initializable, GovernorVotesUpgradeable
         __GovernorVoteMocks_init_unchained(name_, token_);
     }
 
-    function __GovernorVoteMocks_init_unchained(string memory name_, IVotesUpgradeable token_) internal onlyInitializing {}
+    function __GovernorVoteMocks_init_unchained(string memory, IVotesUpgradeable) internal onlyInitializing {}
 
     function quorum(uint256) public pure override returns (uint256) {
         return 0;

contracts/mocks/MulticallTokenMockUpgradeable.sol

@@ -15,6 +15,6 @@ contract MulticallTokenMockUpgradeable is Initializable, ERC20MockUpgradeable, M
         __MulticallTokenMock_init_unchained(initialBalance);
     }
 
-    function __MulticallTokenMock_init_unchained(uint256 initialBalance) internal onlyInitializing {}
+    function __MulticallTokenMock_init_unchained(uint256) internal onlyInitializing {}
     uint256[50] private __gap;
 }

contracts/mocks/VotesMockUpgradeable.sol

@@ -16,7 +16,7 @@ contract VotesMockUpgradeable is Initializable, VotesUpgradeable {
         __VotesMock_init_unchained(name);
     }
 
-    function __VotesMock_init_unchained(string memory name) internal onlyInitializing {}
+    function __VotesMock_init_unchained(string memory) internal onlyInitializing {}
 
     function getTotalSupply() public view returns (uint256) {
         return _getTotalSupply();

contracts/mocks/WithInit.sol

-pragma solidity >=0.6 <0.9;
+pragma solidity >=0.7 <0.9;
 pragma experimental ABIEncoderV2;
 
 import "./AccessControlMockUpgradeable.sol";
 
 contract AccessControlMockUpgradeableWithInit is AccessControlMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __AccessControlMock_init();
     }
 }
@@ -15,35 +15,35 @@ contract TimelockControllerUpgradeableWithInit is TimelockControllerUpgradeable
         uint256 minDelay,
         address[] memory proposers,
         address[] memory executors
-    ) public payable initializer {
+    ) payable initializer {
         __TimelockController_init(minDelay, proposers, executors);
     }
 }
 import "./wizard/MyGovernor3Upgradeable.sol";
 
 contract MyGovernorUpgradeableWithInit is MyGovernorUpgradeable {
-    constructor(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) public payable initializer {
+    constructor(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) payable initializer {
         __MyGovernor_init(_token, _timelock);
     }
 }
 import "./wizard/MyGovernor2Upgradeable.sol";
 
 contract MyGovernor2UpgradeableWithInit is MyGovernor2Upgradeable {
-    constructor(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) public payable initializer {
+    constructor(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) payable initializer {
         __MyGovernor2_init(_token, _timelock);
     }
 }
 import "./wizard/MyGovernor1Upgradeable.sol";
 
 contract MyGovernor1UpgradeableWithInit is MyGovernor1Upgradeable {
-    constructor(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) public payable initializer {
+    constructor(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) payable initializer {
         __MyGovernor1_init(_token, _timelock);
     }
 }
 import "./GovernorVoteMockUpgradeable.sol";
 
 contract GovernorVoteMocksUpgradeableWithInit is GovernorVoteMocksUpgradeable {
-    constructor(string memory name_, IVotesUpgradeable token_) public payable initializer {
+    constructor(string memory name_, IVotesUpgradeable token_) payable initializer {
         __GovernorVoteMocks_init(name_, token_);
     }
 }
@@ -57,7 +57,7 @@ contract GovernorTimelockControlMockUpgradeableWithInit is GovernorTimelockContr
         uint256 votingPeriod_,
         TimelockControllerUpgradeable timelock_,
         uint256 quorumNumerator_
-    ) public payable initializer {
+    ) payable initializer {
         __GovernorTimelockControlMock_init(name_, token_, votingDelay_, votingPeriod_, timelock_, quorumNumerator_);
     }
 }
@@ -71,7 +71,7 @@ contract GovernorTimelockCompoundMockUpgradeableWithInit is GovernorTimelockComp
         uint256 votingPeriod_,
         ICompoundTimelockUpgradeable timelock_,
         uint256 quorumNumerator_
-    ) public payable initializer {
+    ) payable initializer {
         __GovernorTimelockCompoundMock_init(name_, token_, votingDelay_, votingPeriod_, timelock_, quorumNumerator_);
     }
 }
@@ -85,49 +85,49 @@ contract GovernorCompatibilityBravoMockUpgradeableWithInit is GovernorCompatibil
         uint256 votingPeriod_,
         uint256 proposalThreshold_,
         ICompoundTimelockUpgradeable timelock_
-    ) public payable initializer {
+    ) payable initializer {
         __GovernorCompatibilityBravoMock_init(name_, token_, votingDelay_, votingPeriod_, proposalThreshold_, timelock_);
     }
 }
 import "../token/ERC20/ERC20Upgradeable.sol";
 
 contract ERC20UpgradeableWithInit is ERC20Upgradeable {
-    constructor(string memory name_, string memory symbol_) public payable initializer {
+    constructor(string memory name_, string memory symbol_) payable initializer {
         __ERC20_init(name_, symbol_);
     }
 }
 import "./GovernorCompMockUpgradeable.sol";
 
 contract GovernorCompMockUpgradeableWithInit is GovernorCompMockUpgradeable {
-    constructor(string memory name_, ERC20VotesCompUpgradeable token_) public payable initializer {
+    constructor(string memory name_, ERC20VotesCompUpgradeable token_) payable initializer {
         __GovernorCompMock_init(name_, token_);
     }
 }
 import "./ERC20VotesCompMockUpgradeable.sol";
 
 contract ERC20VotesCompMockUpgradeableWithInit is ERC20VotesCompMockUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC20VotesCompMock_init(name, symbol);
     }
 }
 import "./ERC20VotesMockUpgradeable.sol";
 
 contract ERC20VotesMockUpgradeableWithInit is ERC20VotesMockUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC20VotesMock_init(name, symbol);
     }
 }
 import "./ERC1271WalletMockUpgradeable.sol";
 
 contract ERC1271WalletMockUpgradeableWithInit is ERC1271WalletMockUpgradeable {
-    constructor(address originalOwner) public payable initializer {
+    constructor(address originalOwner) payable initializer {
         __ERC1271WalletMock_init(originalOwner);
     }
 }
 import "./MulticallTokenMockUpgradeable.sol";
 
 contract MulticallTokenMockUpgradeableWithInit is MulticallTokenMockUpgradeable {
-    constructor(uint256 initialBalance) public payable initializer {
+    constructor(uint256 initialBalance) payable initializer {
         __MulticallTokenMock_init(initialBalance);
     }
 }
@@ -139,14 +139,14 @@ contract ERC20MockUpgradeableWithInit is ERC20MockUpgradeable {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20Mock_init(name, symbol, initialAccount, initialBalance);
     }
 }
 import "../token/ERC20/presets/ERC20PresetMinterPauserUpgradeable.sol";
 
 contract ERC20PresetMinterPauserUpgradeableWithInit is ERC20PresetMinterPauserUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC20PresetMinterPauser_init(name, symbol);
     }
 }
@@ -157,35 +157,35 @@ contract ERC721PresetMinterPauserAutoIdUpgradeableWithInit is ERC721PresetMinter
         string memory name,
         string memory symbol,
         string memory baseTokenURI
-    ) public payable initializer {
+    ) payable initializer {
         __ERC721PresetMinterPauserAutoId_init(name, symbol, baseTokenURI);
     }
 }
 import "../token/ERC721/ERC721Upgradeable.sol";
 
 contract ERC721UpgradeableWithInit is ERC721Upgradeable {
-    constructor(string memory name_, string memory symbol_) public payable initializer {
+    constructor(string memory name_, string memory symbol_) payable initializer {
         __ERC721_init(name_, symbol_);
     }
 }
 import "./MathMockUpgradeable.sol";
 
 contract MathMockUpgradeableWithInit is MathMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __MathMock_init();
     }
 }
 import "./CheckpointsImplUpgradeable.sol";
 
 contract CheckpointsImplUpgradeableWithInit is CheckpointsImplUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __CheckpointsImpl_init();
     }
 }
 import "./SafeCastMockUpgradeable.sol";
 
 contract SafeCastMockUpgradeableWithInit is SafeCastMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __SafeCastMock_init();
     }
 }
@@ -198,7 +198,7 @@ contract GovernorMockUpgradeableWithInit is GovernorMockUpgradeable {
         uint256 votingDelay_,
         uint256 votingPeriod_,
         uint256 quorumNumerator_
-    ) public payable initializer {
+    ) payable initializer {
         __GovernorMock_init(name_, token_, votingDelay_, votingPeriod_, quorumNumerator_);
     }
 }
@@ -212,7 +212,7 @@ contract GovernorPreventLateQuorumMockUpgradeableWithInit is GovernorPreventLate
         uint256 votingPeriod_,
         uint256 quorum_,
         uint64 voteExtension_
-    ) public payable initializer {
+    ) payable initializer {
         __GovernorPreventLateQuorumMock_init(name_, token_, votingDelay_, votingPeriod_, quorum_, voteExtension_);
     }
 }
@@ -224,84 +224,84 @@ contract ERC1155ReceiverMockUpgradeableWithInit is ERC1155ReceiverMockUpgradeabl
         bool recReverts,
         bytes4 batRetval,
         bool batReverts
-    ) public payable initializer {
+    ) payable initializer {
         __ERC1155ReceiverMock_init(recRetval, recReverts, batRetval, batReverts);
     }
 }
 import "../token/ERC1155/ERC1155Upgradeable.sol";
 
 contract ERC1155UpgradeableWithInit is ERC1155Upgradeable {
-    constructor(string memory uri_) public payable initializer {
+    constructor(string memory uri_) payable initializer {
         __ERC1155_init(uri_);
     }
 }
 import "../token/ERC1155/presets/ERC1155PresetMinterPauserUpgradeable.sol";
 
 contract ERC1155PresetMinterPauserUpgradeableWithInit is ERC1155PresetMinterPauserUpgradeable {
-    constructor(string memory uri) public payable initializer {
+    constructor(string memory uri) payable initializer {
         __ERC1155PresetMinterPauser_init(uri);
     }
 }
 import "./AccessControlEnumerableMockUpgradeable.sol";
 
 contract AccessControlEnumerableMockUpgradeableWithInit is AccessControlEnumerableMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __AccessControlEnumerableMock_init();
     }
 }
 import "./EnumerableSetMockUpgradeable.sol";
 
 contract EnumerableBytes32SetMockUpgradeableWithInit is EnumerableBytes32SetMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __EnumerableBytes32SetMock_init();
     }
 }
 import "./EnumerableSetMockUpgradeable.sol";
 
 contract EnumerableAddressSetMockUpgradeableWithInit is EnumerableAddressSetMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __EnumerableAddressSetMock_init();
     }
 }
 import "./EnumerableSetMockUpgradeable.sol";
 
 contract EnumerableUintSetMockUpgradeableWithInit is EnumerableUintSetMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __EnumerableUintSetMock_init();
     }
 }
 import "./EnumerableMapMockUpgradeable.sol";
 
 contract EnumerableMapMockUpgradeableWithInit is EnumerableMapMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __EnumerableMapMock_init();
     }
 }
 import "./PausableMockUpgradeable.sol";
 
 contract PausableMockUpgradeableWithInit is PausableMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __PausableMock_init();
     }
 }
 import "./VotesMockUpgradeable.sol";
 
 contract VotesMockUpgradeableWithInit is VotesMockUpgradeable {
-    constructor(string memory name) public payable initializer {
+    constructor(string memory name) payable initializer {
         __VotesMock_init(name);
     }
 }
 import "./EIP712ExternalUpgradeable.sol";
 
 contract EIP712ExternalUpgradeableWithInit is EIP712ExternalUpgradeable {
-    constructor(string memory name, string memory version) public payable initializer {
+    constructor(string memory name, string memory version) payable initializer {
         __EIP712External_init(name, version);
     }
 }
 import "../metatx/MinimalForwarderUpgradeable.sol";
 
 contract MinimalForwarderUpgradeableWithInit is MinimalForwarderUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __MinimalForwarder_init();
     }
 }
@@ -313,77 +313,77 @@ contract ERC20PermitMockUpgradeableWithInit is ERC20PermitMockUpgradeable {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20PermitMock_init(name, symbol, initialAccount, initialBalance);
     }
 }
 import "./ERC721VotesMockUpgradeable.sol";
 
 contract ERC721VotesMockUpgradeableWithInit is ERC721VotesMockUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC721VotesMock_init(name, symbol);
     }
 }
 import "./ERC721URIStorageMockUpgradeable.sol";
 
 contract ERC721URIStorageMockUpgradeableWithInit is ERC721URIStorageMockUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC721URIStorageMock_init(name, symbol);
     }
 }
 import "./ERC165CheckerMockUpgradeable.sol";
 
 contract ERC165CheckerMockUpgradeableWithInit is ERC165CheckerMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC165CheckerMock_init();
     }
 }
 import "./ERC165/ERC165InterfacesSupportedUpgradeable.sol";
 
 contract SupportsInterfaceWithLookupMockUpgradeableWithInit is SupportsInterfaceWithLookupMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __SupportsInterfaceWithLookupMock_init();
     }
 }
 import "./ERC165/ERC165InterfacesSupportedUpgradeable.sol";
 
 contract ERC165InterfacesSupportedUpgradeableWithInit is ERC165InterfacesSupportedUpgradeable {
-    constructor(bytes4[] memory interfaceIds) public payable initializer {
+    constructor(bytes4[] memory interfaceIds) payable initializer {
         __ERC165InterfacesSupported_init(interfaceIds);
     }
 }
 import "./ERC721EnumerableMockUpgradeable.sol";
 
 contract ERC721EnumerableMockUpgradeableWithInit is ERC721EnumerableMockUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC721EnumerableMock_init(name, symbol);
     }
 }
 import "./SafeERC20HelperUpgradeable.sol";
 
 contract ERC20ReturnFalseMockUpgradeableWithInit is ERC20ReturnFalseMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC20ReturnFalseMock_init();
     }
 }
 import "./SafeERC20HelperUpgradeable.sol";
 
 contract ERC20ReturnTrueMockUpgradeableWithInit is ERC20ReturnTrueMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC20ReturnTrueMock_init();
     }
 }
 import "./SafeERC20HelperUpgradeable.sol";
 
 contract ERC20NoReturnMockUpgradeableWithInit is ERC20NoReturnMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC20NoReturnMock_init();
     }
 }
 import "./SafeERC20HelperUpgradeable.sol";
 
 contract SafeERC20WrapperUpgradeableWithInit is SafeERC20WrapperUpgradeable {
-    constructor(IERC20Upgradeable token) public payable initializer {
+    constructor(IERC20Upgradeable token) payable initializer {
         __SafeERC20Wrapper_init(token);
     }
 }
@@ -394,7 +394,7 @@ contract TokenTimelockUpgradeableWithInit is TokenTimelockUpgradeable {
         IERC20Upgradeable token_,
         address beneficiary_,
         uint256 releaseTime_
-    ) public payable initializer {
+    ) payable initializer {
         __TokenTimelock_init(token_, beneficiary_, releaseTime_);
     }
 }
@@ -405,7 +405,7 @@ contract ERC20WrapperMockUpgradeableWithInit is ERC20WrapperMockUpgradeable {
         IERC20Upgradeable _underlyingToken,
         string memory name,
         string memory symbol
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20WrapperMock_init(_underlyingToken, name, symbol);
     }
 }
@@ -416,14 +416,14 @@ contract VestingWalletUpgradeableWithInit is VestingWalletUpgradeable {
         address beneficiaryAddress,
         uint64 startTimestamp,
         uint64 durationSeconds
-    ) public payable initializer {
+    ) payable initializer {
         __VestingWallet_init(beneficiaryAddress, startTimestamp, durationSeconds);
     }
 }
 import "../finance/PaymentSplitterUpgradeable.sol";
 
 contract PaymentSplitterUpgradeableWithInit is PaymentSplitterUpgradeable {
-    constructor(address[] memory payees, uint256[] memory shares_) public payable initializer {
+    constructor(address[] memory payees, uint256[] memory shares_) payable initializer {
         __PaymentSplitter_init(payees, shares_);
     }
 }
@@ -434,7 +434,7 @@ contract ERC777UpgradeableWithInit is ERC777Upgradeable {
         string memory name_,
         string memory symbol_,
         address[] memory defaultOperators_
-    ) public payable initializer {
+    ) payable initializer {
         __ERC777_init(name_, symbol_, defaultOperators_);
     }
 }
@@ -447,35 +447,35 @@ contract ERC777PresetFixedSupplyUpgradeableWithInit is ERC777PresetFixedSupplyUp
         address[] memory defaultOperators,
         uint256 initialSupply,
         address owner
-    ) public payable initializer {
+    ) payable initializer {
         __ERC777PresetFixedSupply_init(name, symbol, defaultOperators, initialSupply, owner);
     }
 }
 import "./ERC777SenderRecipientMockUpgradeable.sol";
 
 contract ERC777SenderRecipientMockUpgradeableWithInit is ERC777SenderRecipientMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC777SenderRecipientMock_init();
     }
 }
 import "../utils/introspection/ERC1820ImplementerUpgradeable.sol";
 
 contract ERC1820ImplementerUpgradeableWithInit is ERC1820ImplementerUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC1820Implementer_init();
     }
 }
 import "./ERC1820ImplementerMockUpgradeable.sol";
 
 contract ERC1820ImplementerMockUpgradeableWithInit is ERC1820ImplementerMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC1820ImplementerMock_init();
     }
 }
 import "./Create2ImplUpgradeable.sol";
 
 contract Create2ImplUpgradeableWithInit is Create2ImplUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __Create2Impl_init();
     }
 }
@@ -488,14 +488,14 @@ contract ERC777MockUpgradeableWithInit is ERC777MockUpgradeable {
         string memory name,
         string memory symbol,
         address[] memory defaultOperators
-    ) public payable initializer {
+    ) payable initializer {
         __ERC777Mock_init(initialHolder, initialBalance, name, symbol, defaultOperators);
     }
 }
 import "./ERC3156FlashBorrowerMockUpgradeable.sol";
 
 contract ERC3156FlashBorrowerMockUpgradeableWithInit is ERC3156FlashBorrowerMockUpgradeable {
-    constructor(bool enableReturn, bool enableApprove) public payable initializer {
+    constructor(bool enableReturn, bool enableApprove) payable initializer {
         __ERC3156FlashBorrowerMock_init(enableReturn, enableApprove);
     }
 }
@@ -507,56 +507,56 @@ contract ERC20FlashMintMockUpgradeableWithInit is ERC20FlashMintMockUpgradeable
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20FlashMintMock_init(name, symbol, initialAccount, initialBalance);
     }
 }
 import "./ERC721RoyaltyMockUpgradeable.sol";
 
 contract ERC721RoyaltyMockUpgradeableWithInit is ERC721RoyaltyMockUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC721RoyaltyMock_init(name, symbol);
     }
 }
 import "./ERC721MockUpgradeable.sol";
 
 contract ERC721MockUpgradeableWithInit is ERC721MockUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC721Mock_init(name, symbol);
     }
 }
 import "./StringsMockUpgradeable.sol";
 
 contract StringsMockUpgradeableWithInit is StringsMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __StringsMock_init();
     }
 }
 import "../token/ERC721/utils/ERC721HolderUpgradeable.sol";
 
 contract ERC721HolderUpgradeableWithInit is ERC721HolderUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC721Holder_init();
     }
 }
 import "./ERC721ReceiverMockUpgradeable.sol";
 
 contract ERC721ReceiverMockUpgradeableWithInit is ERC721ReceiverMockUpgradeable {
-    constructor(bytes4 retval, Error error) public payable initializer {
+    constructor(bytes4 retval, Error error) payable initializer {
         __ERC721ReceiverMock_init(retval, error);
     }
 }
 import "./ERC721BurnableMockUpgradeable.sol";
 
 contract ERC721BurnableMockUpgradeableWithInit is ERC721BurnableMockUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC721BurnableMock_init(name, symbol);
     }
 }
 import "./ERC721PausableMockUpgradeable.sol";
 
 contract ERC721PausableMockUpgradeableWithInit is ERC721PausableMockUpgradeable {
-    constructor(string memory name, string memory symbol) public payable initializer {
+    constructor(string memory name, string memory symbol) payable initializer {
         __ERC721PausableMock_init(name, symbol);
     }
 }
@@ -568,77 +568,77 @@ contract ERC20PausableMockUpgradeableWithInit is ERC20PausableMockUpgradeable {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20PausableMock_init(name, symbol, initialAccount, initialBalance);
     }
 }
 import "./ERC1155PausableMockUpgradeable.sol";
 
 contract ERC1155PausableMockUpgradeableWithInit is ERC1155PausableMockUpgradeable {
-    constructor(string memory uri) public payable initializer {
+    constructor(string memory uri) payable initializer {
         __ERC1155PausableMock_init(uri);
     }
 }
 import "./ERC1155MockUpgradeable.sol";
 
 contract ERC1155MockUpgradeableWithInit is ERC1155MockUpgradeable {
-    constructor(string memory uri) public payable initializer {
+    constructor(string memory uri) payable initializer {
         __ERC1155Mock_init(uri);
     }
 }
 import "./ERC1155SupplyMockUpgradeable.sol";
 
 contract ERC1155SupplyMockUpgradeableWithInit is ERC1155SupplyMockUpgradeable {
-    constructor(string memory uri) public payable initializer {
+    constructor(string memory uri) payable initializer {
         __ERC1155SupplyMock_init(uri);
     }
 }
 import "./ERC1155BurnableMockUpgradeable.sol";
 
 contract ERC1155BurnableMockUpgradeableWithInit is ERC1155BurnableMockUpgradeable {
-    constructor(string memory uri) public payable initializer {
+    constructor(string memory uri) payable initializer {
         __ERC1155BurnableMock_init(uri);
     }
 }
 import "../token/ERC1155/utils/ERC1155HolderUpgradeable.sol";
 
 contract ERC1155HolderUpgradeableWithInit is ERC1155HolderUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC1155Holder_init();
     }
 }
 import "./ERC165StorageMockUpgradeable.sol";
 
 contract ERC165StorageMockUpgradeableWithInit is ERC165StorageMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC165StorageMock_init();
     }
 }
 import "./ERC165MockUpgradeable.sol";
 
 contract ERC165MockUpgradeableWithInit is ERC165MockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC165Mock_init();
     }
 }
 import "./TimersTimestampImplUpgradeable.sol";
 
 contract TimersTimestampImplUpgradeableWithInit is TimersTimestampImplUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __TimersTimestampImpl_init();
     }
 }
 import "./TimersBlockNumberImplUpgradeable.sol";
 
 contract TimersBlockNumberImplUpgradeableWithInit is TimersBlockNumberImplUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __TimersBlockNumberImpl_init();
     }
 }
 import "./ArraysImplUpgradeable.sol";
 
 contract ArraysImplUpgradeableWithInit is ArraysImplUpgradeable {
-    constructor(uint256[] memory array) public payable initializer {
+    constructor(uint256[] memory array) payable initializer {
         __ArraysImpl_init(array);
     }
 }
@@ -650,49 +650,49 @@ contract ERC20SnapshotMockUpgradeableWithInit is ERC20SnapshotMockUpgradeable {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20SnapshotMock_init(name, symbol, initialAccount, initialBalance);
     }
 }
 import "./CountersImplUpgradeable.sol";
 
 contract CountersImplUpgradeableWithInit is CountersImplUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __CountersImpl_init();
     }
 }
 import "./UUPS/TestInProdUpgradeable.sol";
 
 contract UUPSUpgradeableMockUpgradeableWithInit is UUPSUpgradeableMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __UUPSUpgradeableMock_init();
     }
 }
 import "./UUPS/TestInProdUpgradeable.sol";
 
 contract UUPSUpgradeableUnsafeMockUpgradeableWithInit is UUPSUpgradeableUnsafeMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __UUPSUpgradeableUnsafeMock_init();
     }
 }
 import "./UUPS/TestInProdUpgradeable.sol";
 
 contract UUPSUpgradeableBrokenMockUpgradeableWithInit is UUPSUpgradeableBrokenMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __UUPSUpgradeableBrokenMock_init();
     }
 }
 import "./ReentrancyAttackUpgradeable.sol";
 
 contract ReentrancyAttackUpgradeableWithInit is ReentrancyAttackUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ReentrancyAttack_init();
     }
 }
 import "./ReentrancyMockUpgradeable.sol";
 
 contract ReentrancyMockUpgradeableWithInit is ReentrancyMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ReentrancyMock_init();
     }
 }
@@ -704,7 +704,7 @@ contract ERC20PresetFixedSupplyUpgradeableWithInit is ERC20PresetFixedSupplyUpgr
         string memory symbol,
         uint256 initialSupply,
         address owner
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20PresetFixedSupply_init(name, symbol, initialSupply, owner);
     }
 }
@@ -716,21 +716,21 @@ contract ERC20BurnableMockUpgradeableWithInit is ERC20BurnableMockUpgradeable {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20BurnableMock_init(name, symbol, initialAccount, initialBalance);
     }
 }
 import "./ContextMockUpgradeable.sol";
 
 contract ContextMockUpgradeableWithInit is ContextMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ContextMock_init();
     }
 }
 import "./ContextMockUpgradeable.sol";
 
 contract ContextMockCallerUpgradeableWithInit is ContextMockCallerUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ContextMockCaller_init();
     }
 }
@@ -741,7 +741,7 @@ contract ERC20DecimalsMockUpgradeableWithInit is ERC20DecimalsMockUpgradeable {
         string memory name_,
         string memory symbol_,
         uint8 decimals_
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20DecimalsMock_init(name_, symbol_, decimals_);
     }
 }
@@ -752,196 +752,196 @@ contract ERC20CappedMockUpgradeableWithInit is ERC20CappedMockUpgradeable {
         string memory name,
         string memory symbol,
         uint256 cap
-    ) public payable initializer {
+    ) payable initializer {
         __ERC20CappedMock_init(name, symbol, cap);
     }
 }
 import "./MulticallTestUpgradeable.sol";
 
 contract MulticallTestUpgradeableWithInit is MulticallTestUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __MulticallTest_init();
     }
 }
 import "../utils/escrow/EscrowUpgradeable.sol";
 
 contract EscrowUpgradeableWithInit is EscrowUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __Escrow_init();
     }
 }
 import "./PullPaymentMockUpgradeable.sol";
 
 contract PullPaymentMockUpgradeableWithInit is PullPaymentMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __PullPaymentMock_init();
     }
 }
 import "../utils/escrow/RefundEscrowUpgradeable.sol";
 
 contract RefundEscrowUpgradeableWithInit is RefundEscrowUpgradeable {
-    constructor(address payable beneficiary_) public payable initializer {
+    constructor(address payable beneficiary_) payable initializer {
         __RefundEscrow_init(beneficiary_);
     }
 }
 import "./ConditionalEscrowMockUpgradeable.sol";
 
 contract ConditionalEscrowMockUpgradeableWithInit is ConditionalEscrowMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ConditionalEscrowMock_init();
     }
 }
 import "./ClonesMockUpgradeable.sol";
 
 contract ClonesMockUpgradeableWithInit is ClonesMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ClonesMock_init();
     }
 }
 import "./AddressImplUpgradeable.sol";
 
 contract AddressImplUpgradeableWithInit is AddressImplUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __AddressImpl_init();
     }
 }
 import "./StorageSlotMockUpgradeable.sol";
 
 contract StorageSlotMockUpgradeableWithInit is StorageSlotMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __StorageSlotMock_init();
     }
 }
 import "./OwnableMockUpgradeable.sol";
 
 contract OwnableMockUpgradeableWithInit is OwnableMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __OwnableMock_init();
     }
 }
 import "./SignatureCheckerMockUpgradeable.sol";
 
 contract SignatureCheckerMockUpgradeableWithInit is SignatureCheckerMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __SignatureCheckerMock_init();
     }
 }
 import "./ECDSAMockUpgradeable.sol";
 
 contract ECDSAMockUpgradeableWithInit is ECDSAMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ECDSAMock_init();
     }
 }
 import "./BadBeaconUpgradeable.sol";
 
 contract BadBeaconNoImplUpgradeableWithInit is BadBeaconNoImplUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __BadBeaconNoImpl_init();
     }
 }
 import "./BadBeaconUpgradeable.sol";
 
 contract BadBeaconNotContractUpgradeableWithInit is BadBeaconNotContractUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __BadBeaconNotContract_init();
     }
 }
 import "./Base64MockUpgradeable.sol";
 
 contract Base64MockUpgradeableWithInit is Base64MockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __Base64Mock_init();
     }
 }
 import "./BitmapMockUpgradeable.sol";
 
 contract BitMapMockUpgradeableWithInit is BitMapMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __BitMapMock_init();
     }
 }
 import "./CallReceiverMockUpgradeable.sol";
 
 contract CallReceiverMockUpgradeableWithInit is CallReceiverMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __CallReceiverMock_init();
     }
 }
 import "./ClashingImplementationUpgradeable.sol";
 
 contract ClashingImplementationUpgradeableWithInit is ClashingImplementationUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ClashingImplementation_init();
     }
 }
 import "./compound/CompTimelockUpgradeable.sol";
 
 contract CompTimelockUpgradeableWithInit is CompTimelockUpgradeable {
-    constructor(address admin_, uint256 delay_) public payable initializer {
+    constructor(address admin_, uint256 delay_) payable initializer {
         __CompTimelock_init(admin_, delay_);
     }
 }
 import "./DummyImplementationUpgradeable.sol";
 
 contract DummyImplementationUpgradeableWithInit is DummyImplementationUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __DummyImplementation_init();
     }
 }
 import "./DummyImplementationUpgradeable.sol";
 
 contract DummyImplementationV2UpgradeableWithInit is DummyImplementationV2Upgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __DummyImplementationV2_init();
     }
 }
 import "./ERC165/ERC165MissingDataUpgradeable.sol";
 
 contract ERC165MissingDataUpgradeableWithInit is ERC165MissingDataUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC165MissingData_init();
     }
 }
 import "./ERC165/ERC165NotSupportedUpgradeable.sol";
 
 contract ERC165NotSupportedUpgradeableWithInit is ERC165NotSupportedUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __ERC165NotSupported_init();
     }
 }
 import "./EtherReceiverMockUpgradeable.sol";
 
 contract EtherReceiverMockUpgradeableWithInit is EtherReceiverMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __EtherReceiverMock_init();
     }
 }
 import "./MerkleProofWrapperUpgradeable.sol";
 
 contract MerkleProofWrapperUpgradeableWithInit is MerkleProofWrapperUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __MerkleProofWrapper_init();
     }
 }
 import "./SafeMathMockUpgradeable.sol";
 
 contract SafeMathMockUpgradeableWithInit is SafeMathMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __SafeMathMock_init();
     }
 }
 import "./SignedMathMockUpgradeable.sol";
 
 contract SignedMathMockUpgradeableWithInit is SignedMathMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __SignedMathMock_init();
     }
 }
 import "./SignedSafeMathMockUpgradeable.sol";
 
 contract SignedSafeMathMockUpgradeableWithInit is SignedSafeMathMockUpgradeable {
-    constructor() public payable initializer {
+    constructor() payable initializer {
         __SignedSafeMathMock_init();
     }
 }

contracts/mocks/wizard/MyGovernor1Upgradeable.sol

@@ -29,7 +29,7 @@ contract MyGovernor1Upgradeable is
         __MyGovernor1_init_unchained(_token, _timelock);
     }
 
-    function __MyGovernor1_init_unchained(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {}
+    function __MyGovernor1_init_unchained(IVotesUpgradeable, TimelockControllerUpgradeable) internal onlyInitializing {}
 
     function votingDelay() public pure override returns (uint256) {
         return 1; // 1 block

contracts/mocks/wizard/MyGovernor2Upgradeable.sol

@@ -32,7 +32,7 @@ contract MyGovernor2Upgradeable is
         __MyGovernor2_init_unchained(_token, _timelock);
     }
 
-    function __MyGovernor2_init_unchained(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {}
+    function __MyGovernor2_init_unchained(IVotesUpgradeable, TimelockControllerUpgradeable) internal onlyInitializing {}
 
     function votingDelay() public pure override returns (uint256) {
         return 1; // 1 block

contracts/mocks/wizard/MyGovernor3Upgradeable.sol

@@ -30,7 +30,7 @@ contract MyGovernorUpgradeable is
         __MyGovernor_init_unchained(_token, _timelock);
     }
 
-    function __MyGovernor_init_unchained(IVotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {}
+    function __MyGovernor_init_unchained(IVotesUpgradeable, TimelockControllerUpgradeable) internal onlyInitializing {}
 
     function votingDelay() public pure override returns (uint256) {
         return 1; // 1 block

contracts/token/ERC1155/presets/ERC1155PresetMinterPauserUpgradeable.sol

@@ -49,7 +49,7 @@ contract ERC1155PresetMinterPauserUpgradeable is Initializable, ContextUpgradeab
         __ERC1155PresetMinterPauser_init_unchained(uri);
     }
 
-    function __ERC1155PresetMinterPauser_init_unchained(string memory uri) internal onlyInitializing {
+    function __ERC1155PresetMinterPauser_init_unchained(string memory) internal onlyInitializing {
         _setupRole(DEFAULT_ADMIN_ROLE, _msgSender());
 
         _setupRole(MINTER_ROLE, _msgSender());

contracts/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol

@@ -39,7 +39,7 @@ abstract contract ERC20PermitUpgradeable is Initializable, ERC20Upgradeable, IER
         __ERC20Permit_init_unchained(name);
     }
 
-    function __ERC20Permit_init_unchained(string memory name) internal onlyInitializing {
+    function __ERC20Permit_init_unchained(string memory) internal onlyInitializing {
         _PERMIT_TYPEHASH = keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)");}
 
     /**

contracts/token/ERC20/presets/ERC20PresetFixedSupplyUpgradeable.sol

@@ -46,8 +46,8 @@ contract ERC20PresetFixedSupplyUpgradeable is Initializable, ERC20BurnableUpgrad
     }
 
     function __ERC20PresetFixedSupply_init_unchained(
-        string memory name,
-        string memory symbol,
+        string memory,
+        string memory,
         uint256 initialSupply,
         address owner
     ) internal onlyInitializing {

contracts/token/ERC20/presets/ERC20PresetMinterPauserUpgradeable.sol

@@ -51,7 +51,7 @@ contract ERC20PresetMinterPauserUpgradeable is Initializable, ContextUpgradeable
         __ERC20PresetMinterPauser_init_unchained(name, symbol);
     }
 
-    function __ERC20PresetMinterPauser_init_unchained(string memory name, string memory symbol) internal onlyInitializing {
+    function __ERC20PresetMinterPauser_init_unchained(string memory, string memory) internal onlyInitializing {
         _setupRole(DEFAULT_ADMIN_ROLE, _msgSender());
 
         _setupRole(MINTER_ROLE, _msgSender());

contracts/token/ERC721/presets/ERC721PresetMinterPauserAutoIdUpgradeable.sol

@@ -77,8 +77,8 @@ contract ERC721PresetMinterPauserAutoIdUpgradeable is
     }
 
     function __ERC721PresetMinterPauserAutoId_init_unchained(
-        string memory name,
-        string memory symbol,
+        string memory,
+        string memory,
         string memory baseTokenURI
     ) internal onlyInitializing {
         _baseTokenURI = baseTokenURI;

contracts/token/ERC777/presets/ERC777PresetFixedSupplyUpgradeable.sol

@@ -41,9 +41,9 @@ contract ERC777PresetFixedSupplyUpgradeable is Initializable, ERC777Upgradeable
     }
 
     function __ERC777PresetFixedSupply_init_unchained(
-        string memory name,
-        string memory symbol,
-        address[] memory defaultOperators,
+        string memory,
+        string memory,
+        address[] memory,
         uint256 initialSupply,
         address owner
     ) internal onlyInitializing {