remove empty static call tests

45 files changed, 0 insertions, 964 deletions

diff --git a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueToItself.json b/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueToItself.json
deleted file mode 100644
index e6e90927f..000000000
--- a/GeneralStateTests/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueToItself.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CREATE_ContractSuicideDuringInit_WithValueToItself" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CREATE_EContractCreateEContractInInit_Tr.json b/GeneralStateTests/stStaticCall/static_CREATE_EContractCreateEContractInInit_Tr.json
deleted file mode 100644
index 9500f75f8..000000000
--- a/GeneralStateTests/stStaticCall/static_CREATE_EContractCreateEContractInInit_Tr.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CREATE_EContractCreateEContractInInit_Tr" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CREATE_EContractCreateNEContractInInitOOG_Tr.json b/GeneralStateTests/stStaticCall/static_CREATE_EContractCreateNEContractInInitOOG_Tr.json
deleted file mode 100644
index 2f7a62419..000000000
--- a/GeneralStateTests/stStaticCall/static_CREATE_EContractCreateNEContractInInitOOG_Tr.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CREATE_EContractCreateNEContractInInitOOG_Tr" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CREATE_EContractCreateNEContractInInit_Tr.json b/GeneralStateTests/stStaticCall/static_CREATE_EContractCreateNEContractInInit_Tr.json
deleted file mode 100644
index 19c4b3b2e..000000000
--- a/GeneralStateTests/stStaticCall/static_CREATE_EContractCreateNEContractInInit_Tr.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CREATE_EContractCreateNEContractInInit_Tr" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CREATE_EContract_ThenCALLToNonExistentAcc.json b/GeneralStateTests/stStaticCall/static_CREATE_EContract_ThenCALLToNonExistentAcc.json
deleted file mode 100644
index f32fc2354..000000000
--- a/GeneralStateTests/stStaticCall/static_CREATE_EContract_ThenCALLToNonExistentAcc.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CREATE_EContract_ThenCALLToNonExistentAcc" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractAndCallIt_1wei.json b/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractAndCallIt_1wei.json
deleted file mode 100644
index 59b827544..000000000
--- a/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractAndCallIt_1wei.json
+++ /dev/null
@@ -1,187 +0,0 @@
-{
-    "static_CREATE_EmptyContractAndCallIt_1wei" : {
-        "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0xa660c82a33d59e0be1dc073fd663a3b1266c9e8bfe37d21a962b6bc42ae975ae",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "postState" : {
-                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                            "balance" : "0x5208",
-                            "code" : "",
-                            "nonce" : "0x00",
-                            "storage" : {
-                            }
-                        },
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : "0xe8d4a4bdf8",
-                            "code" : "",
-                            "nonce" : "0x01",
-                            "storage" : {
-                            }
-                        },
-                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : "0x01",
-                            "code" : "",
-                            "nonce" : "0x00",
-                            "storage" : {
-                            }
-                        }
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xa660c82a33d59e0be1dc073fd663a3b1266c9e8bfe37d21a962b6bc42ae975ae",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "postState" : {
-                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                            "balance" : "0x5208",
-                            "code" : "",
-                            "nonce" : "0x00",
-                            "storage" : {
-                            }
-                        },
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : "0xe8d4a4bdf8",
-                            "code" : "",
-                            "nonce" : "0x01",
-                            "storage" : {
-                            }
-                        },
-                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : "0x01",
-                            "code" : "",
-                            "nonce" : "0x00",
-                            "storage" : {
-                            }
-                        }
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xa660c82a33d59e0be1dc073fd663a3b1266c9e8bfe37d21a962b6bc42ae975ae",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "postState" : {
-                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                            "balance" : "0x5208",
-                            "code" : "",
-                            "nonce" : "0x00",
-                            "storage" : {
-                            }
-                        },
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : "0xe8d4a4bdf8",
-                            "code" : "",
-                            "nonce" : "0x01",
-                            "storage" : {
-                            }
-                        },
-                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : "0x01",
-                            "code" : "",
-                            "nonce" : "0x00",
-                            "storage" : {
-                            }
-                        }
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xa660c82a33d59e0be1dc073fd663a3b1266c9e8bfe37d21a962b6bc42ae975ae",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "postState" : {
-                        "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                            "balance" : "0x5208",
-                            "code" : "",
-                            "nonce" : "0x00",
-                            "storage" : {
-                            }
-                        },
-                        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : "0xe8d4a4bdf8",
-                            "code" : "",
-                            "nonce" : "0x01",
-                            "storage" : {
-                            }
-                        },
-                        "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                            "balance" : "0x01",
-                            "code" : "",
-                            "nonce" : "0x00",
-                            "storage" : {
-                            }
-                        }
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0xa660c82a33d59e0be1dc073fd663a3b1266c9e8bfe37d21a962b6bc42ae975ae",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a51000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                ""
-            ],
-            "gasLimit" : [
-                "0x0927c0"
-            ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : [
-                "0x00"
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorage.json b/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorage.json
deleted file mode 100644
index 471503d55..000000000
--- a/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorage.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CREATE_EmptyContractWithStorage" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_1wei.json b/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_1wei.json
deleted file mode 100644
index 2227f98d0..000000000
--- a/GeneralStateTests/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_1wei.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CREATE_EmptyContractWithStorageAndCallIt_1wei" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CREATE_empty000CreateinInitCode_Transaction.json b/GeneralStateTests/stStaticCall/static_CREATE_empty000CreateinInitCode_Transaction.json
deleted file mode 100644
index 808503713..000000000
--- a/GeneralStateTests/stStaticCall/static_CREATE_empty000CreateinInitCode_Transaction.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CREATE_empty000CreateinInitCode_Transaction" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CallToNameRegistratorAddressTooBigLeft.json b/GeneralStateTests/stStaticCall/static_CallToNameRegistratorAddressTooBigLeft.json
deleted file mode 100644
index 46e1e76a6..000000000
--- a/GeneralStateTests/stStaticCall/static_CallToNameRegistratorAddressTooBigLeft.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CallToNameRegistratorAddressTooBigLeft" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CallToNameRegistratorAddressTooBigRight.json b/GeneralStateTests/stStaticCall/static_CallToNameRegistratorAddressTooBigRight.json
deleted file mode 100644
index 3f582162f..000000000
--- a/GeneralStateTests/stStaticCall/static_CallToNameRegistratorAddressTooBigRight.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CallToNameRegistratorAddressTooBigRight" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CallToNameRegistratorMemOOGAndInsufficientBalance.json b/GeneralStateTests/stStaticCall/static_CallToNameRegistratorMemOOGAndInsufficientBalance.json
deleted file mode 100644
index 830fa161e..000000000
--- a/GeneralStateTests/stStaticCall/static_CallToNameRegistratorMemOOGAndInsufficientBalance.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CallToNameRegistratorMemOOGAndInsufficientBalance" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_CallToNameRegistratorNotMuchMemory0.json b/GeneralStateTests/stStaticCall/static_CallToNameRegistratorNotMuchMemory0.json
deleted file mode 100644
index 37db22e69..000000000
--- a/GeneralStateTests/stStaticCall/static_CallToNameRegistratorNotMuchMemory0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_CallToNameRegistratorNotMuchMemory0" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_InternalCallHittingGasLimitSuccess.json b/GeneralStateTests/stStaticCall/static_InternalCallHittingGasLimitSuccess.json
deleted file mode 100644
index 15a484fcf..000000000
--- a/GeneralStateTests/stStaticCall/static_InternalCallHittingGasLimitSuccess.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_InternalCallHittingGasLimitSuccess" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_InternlCallStoreClearsSucces.json b/GeneralStateTests/stStaticCall/static_InternlCallStoreClearsSucces.json
deleted file mode 100644
index a6de06c6c..000000000
--- a/GeneralStateTests/stStaticCall/static_InternlCallStoreClearsSucces.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "static_InternlCallStoreClearsSucces" : {
-        "env" : {
-            "currentCoinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x020000",
-            "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x852b5b9bc9b3266d7deb21d9c27c841c1ad67efed44e194914c45756d8fdcf72",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x852b5b9bc9b3266d7deb21d9c27c841c1ad67efed44e194914c45756d8fdcf72",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x852b5b9bc9b3266d7deb21d9c27c841c1ad67efed44e194914c45756d8fdcf72",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x852b5b9bc9b3266d7deb21d9c27c841c1ad67efed44e194914c45756d8fdcf72",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x71a1f4caf782094e8fa3ceb1d7740bd2b47af2ef6a060c28e7ac83058d21064b",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
-        "pre" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x00",
-                "code" : "0x6000600055600060015560006002556000600355600060045560006005556000600655600060075560006008556000600955",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0c",
-                    "0x01" : "0x0c",
-                    "0x02" : "0x0c",
-                    "0x03" : "0x0c",
-                    "0x04" : "0x0c",
-                    "0x05" : "0x0c",
-                    "0x06" : "0x0c",
-                    "0x07" : "0x0c",
-                    "0x08" : "0x0c",
-                    "0x09" : "0x0c"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f4240",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0a",
-                "code" : "0x60006000600060006000620186a0fa",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                ""
-            ],
-            "gasLimit" : [
-                "0x027100"
-            ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : [
-                "0x0a"
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_RawCallGas.json b/GeneralStateTests/stStaticCall/static_RawCallGas.json
deleted file mode 100644
index 53a3e409c..000000000
--- a/GeneralStateTests/stStaticCall/static_RawCallGas.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_RawCallGas" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_RawCallGasValueTransfer.json b/GeneralStateTests/stStaticCall/static_RawCallGasValueTransfer.json
deleted file mode 100644
index 81be23ac6..000000000
--- a/GeneralStateTests/stStaticCall/static_RawCallGasValueTransfer.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_RawCallGasValueTransfer" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_RawCallGasValueTransferAsk.json b/GeneralStateTests/stStaticCall/static_RawCallGasValueTransferAsk.json
deleted file mode 100644
index f6d8fa86f..000000000
--- a/GeneralStateTests/stStaticCall/static_RawCallGasValueTransferAsk.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_RawCallGasValueTransferAsk" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_RawCallGasValueTransferMemory.json b/GeneralStateTests/stStaticCall/static_RawCallGasValueTransferMemory.json
deleted file mode 100644
index 94a078c7f..000000000
--- a/GeneralStateTests/stStaticCall/static_RawCallGasValueTransferMemory.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_RawCallGasValueTransferMemory" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_RawCallGasValueTransferMemoryAsk.json b/GeneralStateTests/stStaticCall/static_RawCallGasValueTransferMemoryAsk.json
deleted file mode 100644
index d927dac24..000000000
--- a/GeneralStateTests/stStaticCall/static_RawCallGasValueTransferMemoryAsk.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_RawCallGasValueTransferMemoryAsk" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_Return50000.json b/GeneralStateTests/stStaticCall/static_Return50000.json
deleted file mode 100644
index 125aaeb91..000000000
--- a/GeneralStateTests/stStaticCall/static_Return50000.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_Return50000 " : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_RevertDepthCreateAddressCollision.json b/GeneralStateTests/stStaticCall/static_RevertDepthCreateAddressCollision.json
deleted file mode 100644
index d01d45e0b..000000000
--- a/GeneralStateTests/stStaticCall/static_RevertDepthCreateAddressCollision.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_RevertDepthCreateAddressCollision" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_RevertDepthCreateOOG.json b/GeneralStateTests/stStaticCall/static_RevertDepthCreateOOG.json
deleted file mode 100644
index 38bab8aae..000000000
--- a/GeneralStateTests/stStaticCall/static_RevertDepthCreateOOG.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_RevertDepthCreateOOG" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_RevertOpcodeDirectCall.json b/GeneralStateTests/stStaticCall/static_RevertOpcodeDirectCall.json
deleted file mode 100644
index 16323c1ed..000000000
--- a/GeneralStateTests/stStaticCall/static_RevertOpcodeDirectCall.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_RevertOpcodeDirectCall" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_TouchToEmptyAccountRevert.json b/GeneralStateTests/stStaticCall/static_TouchToEmptyAccountRevert.json
deleted file mode 100644
index 4e4c651fc..000000000
--- a/GeneralStateTests/stStaticCall/static_TouchToEmptyAccountRevert.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_TouchToEmptyAccountRevert" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_Transaction64Rule_d64e0.json b/GeneralStateTests/stStaticCall/static_Transaction64Rule_d64e0.json
deleted file mode 100644
index dd7e14468..000000000
--- a/GeneralStateTests/stStaticCall/static_Transaction64Rule_d64e0.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_Transaction64Rule_d64e0" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_Transaction64Rule_d64m1.json b/GeneralStateTests/stStaticCall/static_Transaction64Rule_d64m1.json
deleted file mode 100644
index 34474450e..000000000
--- a/GeneralStateTests/stStaticCall/static_Transaction64Rule_d64m1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_Transaction64Rule_d64m1" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_Transaction64Rule_d64p1.json b/GeneralStateTests/stStaticCall/static_Transaction64Rule_d64p1.json
deleted file mode 100644
index 00a287141..000000000
--- a/GeneralStateTests/stStaticCall/static_Transaction64Rule_d64p1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_Transaction64Rule_d64p1" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_ZeroValue_CALL2.json b/GeneralStateTests/stStaticCall/static_ZeroValue_CALL2.json
deleted file mode 100644
index 1d4a38464..000000000
--- a/GeneralStateTests/stStaticCall/static_ZeroValue_CALL2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_ZeroValue_CALL2" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_ZeroValue_SUICIDE_ToEmpty_OOGRevert.json b/GeneralStateTests/stStaticCall/static_ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
deleted file mode 100644
index b8431f3c0..000000000
--- a/GeneralStateTests/stStaticCall/static_ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stStaticCall/static_ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
deleted file mode 100644
index 5bed8019f..000000000
--- a/GeneralStateTests/stStaticCall/static_ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stStaticCall/static_ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
deleted file mode 100644
index 596285d77..000000000
--- a/GeneralStateTests/stStaticCall/static_ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_callOrigin.json b/GeneralStateTests/stStaticCall/static_callOrigin.json
deleted file mode 100644
index 3b8cfe53d..000000000
--- a/GeneralStateTests/stStaticCall/static_callOrigin.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "static_callToStaticOpCodeCheck" : {
-        "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x51908849a3a398fb5c365a5fab81558e355499bc37386550e7681bbc0a939a90",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x51908849a3a398fb5c365a5fab81558e355499bc37386550e7681bbc0a939a90",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x51908849a3a398fb5c365a5fab81558e355499bc37386550e7681bbc0a939a90",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x51908849a3a398fb5c365a5fab81558e355499bc37386550e7681bbc0a939a90",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0xc7bfb8eee1d22e9f35f09a52d4c3bc927661eedd062495e607caa89404cc677d",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6000600060006000600035620186a0fa600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6000600060006000731000000000000000000000000000000000000002620186a0fa6000526000516001146036576001600155603c565b60016001525b",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x3273a94f5374fce5edbc8e2a8697c15331677e6ebf0b1460225760026001556028565b60016001525b3373100000000000000000000000000000000000000114604b5760026001556051565b60016001525b30731000000000000000000000000000000000000002146074576002600155607a565b60016001525b34620186a014608c5760026001556092565b60016001525b",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                "0x0000000000000000000000001000000000000000000000000000000000000001"
-            ],
-            "gasLimit" : [
-                "0x0f4240"
-            ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x1000000000000000000000000000000000000000",
-            "value" : [
-                "0x0186a0"
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_log1_Caller.json b/GeneralStateTests/stStaticCall/static_log1_Caller.json
deleted file mode 100644
index 9d02f5475..000000000
--- a/GeneralStateTests/stStaticCall/static_log1_Caller.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-    "static_log1_Caller" : {
-        "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0x9b36595cdaebce2ac0d18fb4c405fff4f384cc3e5a7789d1182c8d310a142f44",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0x9b36595cdaebce2ac0d18fb4c405fff4f384cc3e5a7789d1182c8d310a142f44",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0x9b36595cdaebce2ac0d18fb4c405fff4f384cc3e5a7789d1182c8d310a142f44",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0x9b36595cdaebce2ac0d18fb4c405fff4f384cc3e5a7789d1182c8d310a142f44",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x438b72a01253dca55ced4d4ac9226e52b54ce920e673e9746e16212723759d1c",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6000600060006000730f572e5295c57f15886f9b263e2f6d2d6c7b5ec66103e8fa600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff6000533360206000a1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                ""
-            ],
-            "gasLimit" : [
-                "0x033450"
-            ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : [
-                "0x0186a0"
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_log2_Caller.json b/GeneralStateTests/stStaticCall/static_log2_Caller.json
deleted file mode 100644
index 36b023702..000000000
--- a/GeneralStateTests/stStaticCall/static_log2_Caller.json
+++ /dev/null
@@ -1,294 +0,0 @@
-{
-    "static_log_Caller" : {
-        "env" : {
-            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x20000",
-            "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x01",
-            "currentTimestamp" : "0x03e8",
-            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "post" : {
-            "EIP150" : [
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 4,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "EIP158" : [
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 4,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Frontier" : [
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 4,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Homestead" : [
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0xa1ab304e4b94ee2cc5fb911d9653f57142ecac55d0f776baf9eb92959d379290",
-                    "indexes" : {
-                        "data" : 4,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ],
-            "Metropolis" : [
-                {
-                    "hash" : "0x2e70e4e1469ab268f03415c6af5004435325052080a4084bbe5ebd8a3e353abf",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x2e70e4e1469ab268f03415c6af5004435325052080a4084bbe5ebd8a3e353abf",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x2e70e4e1469ab268f03415c6af5004435325052080a4084bbe5ebd8a3e353abf",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x2e70e4e1469ab268f03415c6af5004435325052080a4084bbe5ebd8a3e353abf",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                },
-                {
-                    "hash" : "0x2e70e4e1469ab268f03415c6af5004435325052080a4084bbe5ebd8a3e353abf",
-                    "indexes" : {
-                        "data" : 4,
-                        "gas" : 0,
-                        "value" : 0
-                    }
-                }
-            ]
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600060006000600060003561c350fa600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff6000533360206000a1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60005333600060206000a2",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x3000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff600053336000600060206000a3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x4000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff6000533360006000600060206000a4",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60005360206000a0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "transaction" : {
-            "data" : [
-                "0x000000000000000000000000a000000000000000000000000000000000000000",
-                "0x0000000000000000000000001000000000000000000000000000000000000000",
-                "0x0000000000000000000000002000000000000000000000000000000000000000",
-                "0x0000000000000000000000003000000000000000000000000000000000000000",
-                "0x0000000000000000000000004000000000000000000000000000000000000000"
-            ],
-            "gasLimit" : [
-                "0x033450"
-            ],
-            "gasPrice" : "0x01",
-            "nonce" : "0x00",
-            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : [
-                "0x0186a0"
-            ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_log3_Caller.json b/GeneralStateTests/stStaticCall/static_log3_Caller.json
deleted file mode 100644
index fcfe9f60a..000000000
--- a/GeneralStateTests/stStaticCall/static_log3_Caller.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_log3_Caller" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_log3_MaxTopic.json b/GeneralStateTests/stStaticCall/static_log3_MaxTopic.json
deleted file mode 100644
index b634254e9..000000000
--- a/GeneralStateTests/stStaticCall/static_log3_MaxTopic.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_log3_MaxTopic" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_log3_emptyMem.json b/GeneralStateTests/stStaticCall/static_log3_emptyMem.json
deleted file mode 100644
index 112517692..000000000
--- a/GeneralStateTests/stStaticCall/static_log3_emptyMem.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_log3_emptyMem" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_log3_logMemStartTooHigh.json b/GeneralStateTests/stStaticCall/static_log3_logMemStartTooHigh.json
deleted file mode 100644
index f2940d892..000000000
--- a/GeneralStateTests/stStaticCall/static_log3_logMemStartTooHigh.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_log3_logMemStartTooHigh" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_log3_logMemsizeTooHigh.json b/GeneralStateTests/stStaticCall/static_log3_logMemsizeTooHigh.json
deleted file mode 100644
index a920c494f..000000000
--- a/GeneralStateTests/stStaticCall/static_log3_logMemsizeTooHigh.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_log3_logMemsizeTooHigh" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_log3_logMemsizeZero.json b/GeneralStateTests/stStaticCall/static_log3_logMemsizeZero.json
deleted file mode 100644
index 299acfca3..000000000
--- a/GeneralStateTests/stStaticCall/static_log3_logMemsizeZero.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_log3_logMemsizeZero" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_log4_Caller.json b/GeneralStateTests/stStaticCall/static_log4_Caller.json
deleted file mode 100644
index 6a6727fb6..000000000
--- a/GeneralStateTests/stStaticCall/static_log4_Caller.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_log4_Caller" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_refund_CallA_OOG.json b/GeneralStateTests/stStaticCall/static_refund_CallA_OOG.json
deleted file mode 100644
index dd7f75cb1..000000000
--- a/GeneralStateTests/stStaticCall/static_refund_CallA_OOG.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_refund_CallA_OOG" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_refund_CallA_notEnoughGasInCall.json b/GeneralStateTests/stStaticCall/static_refund_CallA_notEnoughGasInCall.json
deleted file mode 100644
index f448f8b3a..000000000
--- a/GeneralStateTests/stStaticCall/static_refund_CallA_notEnoughGasInCall.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_refund_CallA_notEnoughGasInCall" : {
-    }
-}
\ No newline at end of file
diff --git a/GeneralStateTests/stStaticCall/static_refund_CallToSuicideStorage.json b/GeneralStateTests/stStaticCall/static_refund_CallToSuicideStorage.json
deleted file mode 100644
index fa1b1265b..000000000
--- a/GeneralStateTests/stStaticCall/static_refund_CallToSuicideStorage.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "static_refund_CallToSuicideStorage" : {
-    }
-}
\ No newline at end of file