remove commented code, fix some old scripts

certora/harnesses/GovernorPreventLateQuorumHarness.sol

@@ -104,17 +104,6 @@ contract GovernorPreventLateQuorumHarness is Governor, GovernorCountingSimple, G
 
         return deltaWeight;
     }
-    /*
-    function castVote(
-        uint256 proposalId,
-        address account,
-        uint8 support,
-        string memory reason,
-        bytes memory params
-    ) public returns(uint256) {
-        return _castVote(proposalId, account, support, reason, params);
-    }
-    */
 
     function lateQuorumVoteExtension() public view virtual override returns (uint64) {
         return super.lateQuorumVoteExtension();

certora/harnesses/WizardControlFirstPriority.sol

@@ -7,6 +7,7 @@ import "../munged/governance/extensions/GovernorVotes.sol";
 import "../munged/governance/extensions/GovernorVotesQuorumFraction.sol";
 import "../munged/governance/extensions/GovernorTimelockControl.sol";
 import "../munged/governance/extensions/GovernorProposalThreshold.sol";
+import "../munged/token/ERC20/extensions/ERC20Votes.sol";
 
 /* 
 Wizard options:

certora/harnesses/WizardFirstTry.sol

@@ -6,6 +6,7 @@ import "../munged/governance/extensions/GovernorCountingSimple.sol";
 import "../munged/governance/extensions/GovernorVotes.sol";
 import "../munged/governance/extensions/GovernorVotesQuorumFraction.sol";
 import "../munged/governance/extensions/GovernorTimelockCompound.sol";
+import "../munged/token/ERC20/extensions/ERC20Votes.sol";
 
 /* 
 Wizard options:
@@ -83,7 +84,7 @@ contract WizardFirstTry is Governor, GovernorCountingSimple, GovernorVotes, Gove
     function getVotes(address account, uint256 blockNumber)
         public
         view
-        override(IGovernor, GovernorVotes)
+        override(IGovernor, Governor)
         returns (uint256)
     {
         return super.getVotes(account, blockNumber);

certora/scripts/old/GovernorCountingSimple-counting.sh

@@ -3,8 +3,6 @@ make -C certora munged
 certoraRun  certora/harnesses/ERC20VotesHarness.sol certora/harnesses/GovernorBasicHarness.sol \
     --verify GovernorBasicHarness:certora/specs/GovernorCountingSimple.spec \
     --solc solc8.2 \
-    --staging shelly/forSasha \
     --optimistic_loop \
     --settings -copyLoopUnroll=4 \
-    --rule hasVotedCorrelation \
     --msg "$1"

certora/scripts/verifyERC1155All.sh

@@ -8,4 +8,4 @@ certoraRun \
     --loop_iter 3 \
     --cloud \
     --send_only \
-    --msg "ERC1155 Burnable verification all rules"
+    --msg "ERC1155 verification all rules "