diff --git a/contracts/addresses.go b/contracts/addresses.go
index 67b6dc1707..37f475a777 100644
--- a/contracts/addresses.go
+++ b/contracts/addresses.go
@@ -6,9 +6,7 @@ var (
 	RegistryAddress                = common.HexToAddress("0x000000000000000000000000000000000000ce10")
 	GoldTokenAddress               = common.HexToAddress("0x471ece3750da237f93b8e339c536989b8978a438")
 	FeeHandlerAddress              = common.HexToAddress("0xcd437749e43a154c07f3553504c68fbfd56b8778")
-	FeeCurrencyWhitelistAddress    = common.HexToAddress("0xbb024e9cdcb2f9e34d893630d19611b8a5381b3c")
 	MentoFeeHandlerSellerAddress   = common.HexToAddress("0x4efa274b7e33476c961065000d58ee09f7921a74")
 	UniswapFeeHandlerSellerAddress = common.HexToAddress("0xd3aee28548dbb65df03981f0dc0713bfcbd10a97")
-	SortedOraclesAddress           = common.HexToAddress("0xefb84935239dacdecf7c5ba76d8de40b077b7b33")
 	FeeCurrencyDirectoryAddress    = common.HexToAddress("0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb") // tmp address, real one no known yet
 )
diff --git a/contracts/celo/celo.go b/contracts/celo/celo.go
index 7f5f961b36..0b5c089024 100644
--- a/contracts/celo/celo.go
+++ b/contracts/celo/celo.go
@@ -17,15 +17,6 @@ var GoldTokenBytecodeRaw []byte
 //go:embed compiled/Proxy.bin-runtime
 var ProxyBytecodeRaw []byte
 
-//go:embed compiled/SortedOracles.bin-runtime
-var SortedOraclesBytecodeRaw []byte
-
-//go:embed compiled/MockSortedOracles.bin-runtime
-var MockSortedOraclesBytecodeRaw []byte
-
-//go:embed compiled/FeeCurrencyWhitelist.bin-runtime
-var FeeCurrencyWhitelistBytecodeRaw []byte
-
 //go:embed compiled/FeeCurrency.bin-runtime
 var FeeCurrencyBytecodeRaw []byte
 
diff --git a/contracts/celo/compiled/FeeCurrencyWhitelist.abi b/contracts/celo/compiled/FeeCurrencyWhitelist.abi
deleted file mode 100644
index fd17f0b485..0000000000
--- a/contracts/celo/compiled/FeeCurrencyWhitelist.abi
+++ /dev/null
@@ -1,202 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "bool",
-        "name": "test",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "FeeCurrencyWhitelistRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "FeeCurrencyWhitelisted",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      }
-    ],
-    "name": "addToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getVersionNumber",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getWhitelist",
-    "outputs": [
-      {
-        "internalType": "address[]",
-        "name": "",
-        "type": "address[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "initialized",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "tokenAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "index",
-        "type": "uint256"
-      }
-    ],
-    "name": "removeToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "renounceOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "transferOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "whitelist",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
diff --git a/contracts/celo/compiled/FeeCurrencyWhitelist.bin-runtime b/contracts/celo/compiled/FeeCurrencyWhitelist.bin-runtime
deleted file mode 100644
index 6f60b6ec92..0000000000
--- a/contracts/celo/compiled/FeeCurrencyWhitelist.bin-runtime
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b50600436106100be5760003560e01c80638129fc1c11610076578063d01f63f51161005b578063d01f63f51461019e578063d48bfca7146101b3578063f2fde38b146101c657600080fd5b80638129fc1c146101785780638da5cb5b1461018057600080fd5b806354255be0116100a757806354255be014610112578063715018a6146101385780637ebd1b301461014057600080fd5b806313baf1e6146100c3578063158ef93e146100d8575b600080fd5b6100d66100d1366004610800565b6101d9565b005b6000546100fd9074010000000000000000000000000000000000000000900460ff1681565b60405190151581526020015b60405180910390f35b600180806000604080519485526020850193909352918301526060820152608001610109565b6100d66103f3565b61015361014e36600461082a565b610407565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610109565b6100d661043e565b60005473ffffffffffffffffffffffffffffffffffffffff16610153565b6101a661050b565b6040516101099190610843565b6100d66101c136600461089d565b61057a565b6100d66101d436600461089d565b61062a565b6101e16106e1565b8173ffffffffffffffffffffffffffffffffffffffff166001828154811061020b5761020b6108bf565b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff1614610299576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f496e64657820646f6573206e6f74206d6174636800000000000000000000000060448201526064015b60405180910390fd5b60018054906102a881836108ee565b815481106102b8576102b86108bf565b6000918252602090912001546001805473ffffffffffffffffffffffffffffffffffffffff90921691849081106102f1576102f16108bf565b9060005260206000200160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600180548061034a5761034a61092e565b60008281526020908190207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff908301810180547fffffffffffffffffffffffff000000000000000000000000000000000000000016905590910190915560405173ffffffffffffffffffffffffffffffffffffffff851681527fc1f06ffbe5c19d22daa982fd4b3886ced05d83e2bfe7de3b67222728f5234e28910160405180910390a1505050565b6103fb6106e1565b6104056000610762565b565b6001818154811061041757600080fd5b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff16905081565b60005474010000000000000000000000000000000000000000900460ff16156104c3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f636f6e747261637420616c726561647920696e697469616c697a6564000000006044820152606401610290565b600080547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff167401000000000000000000000000000000000000000017905561040533610762565b6060600180548060200260200160405190810160405280929190818152602001828054801561057057602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311610545575b5050505050905090565b6105826106e1565b6001805480820182556000919091527fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf60180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff83169081179091556040519081527fcf4fe1d1989a39011040b0c33ba1165fdeeca971a1ab2b0340b23550f93727e09060200160405180910390a150565b6106326106e1565b73ffffffffffffffffffffffffffffffffffffffff81166106d5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f64647265737300000000000000000000000000000000000000000000000000006064820152608401610290565b6106de81610762565b50565b60005473ffffffffffffffffffffffffffffffffffffffff163314610405576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610290565b6000805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b803573ffffffffffffffffffffffffffffffffffffffff811681146107fb57600080fd5b919050565b6000806040838503121561081357600080fd5b61081c836107d7565b946020939093013593505050565b60006020828403121561083c57600080fd5b5035919050565b6020808252825182820181905260009190848201906040850190845b8181101561089157835173ffffffffffffffffffffffffffffffffffffffff168352928401929184019160010161085f565b50909695505050505050565b6000602082840312156108af57600080fd5b6108b8826107d7565b9392505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b81810381811115610928577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfea164736f6c6343000813000a
diff --git a/contracts/celo/compiled/MockSortedOracles.abi b/contracts/celo/compiled/MockSortedOracles.abi
deleted file mode 100644
index b08fcd06e7..0000000000
--- a/contracts/celo/compiled/MockSortedOracles.abi
+++ /dev/null
@@ -1,244 +0,0 @@
-[
-  {
-    "type": "function",
-    "name": "DENOMINATOR",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "_numRates",
-    "inputs": [
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "expired",
-    "inputs": [
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "isOldestReportExpired",
-    "inputs": [
-      {
-        "name": "token",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      },
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "medianRate",
-    "inputs": [
-      {
-        "name": "token",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      },
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "medianTimestamp",
-    "inputs": [
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "numRates",
-    "inputs": [
-      {
-        "name": "token",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "numerators",
-    "inputs": [
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "setMedianRate",
-    "inputs": [
-      {
-        "name": "token",
-        "type": "address",
-        "internalType": "address"
-      },
-      {
-        "name": "numerator",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable"
-  },
-  {
-    "type": "function",
-    "name": "setMedianTimestamp",
-    "inputs": [
-      {
-        "name": "token",
-        "type": "address",
-        "internalType": "address"
-      },
-      {
-        "name": "timestamp",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "outputs": [],
-    "stateMutability": "nonpayable"
-  },
-  {
-    "type": "function",
-    "name": "setMedianTimestampToNow",
-    "inputs": [
-      {
-        "name": "token",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [],
-    "stateMutability": "nonpayable"
-  },
-  {
-    "type": "function",
-    "name": "setNumRates",
-    "inputs": [
-      {
-        "name": "token",
-        "type": "address",
-        "internalType": "address"
-      },
-      {
-        "name": "rate",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "outputs": [],
-    "stateMutability": "nonpayable"
-  },
-  {
-    "type": "function",
-    "name": "setOldestReportExpired",
-    "inputs": [
-      {
-        "name": "token",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [],
-    "stateMutability": "nonpayable"
-  }
-]
diff --git a/contracts/celo/compiled/MockSortedOracles.bin-runtime b/contracts/celo/compiled/MockSortedOracles.bin-runtime
deleted file mode 100644
index 996f6305bd..0000000000
--- a/contracts/celo/compiled/MockSortedOracles.bin-runtime
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b50600436106100df5760003560e01c80639f219ec11161008c578063ef90e1b011610066578063ef90e1b0146102df578063f06a10e014610307578063f7ca69631461032a578063ffe736bf1461034a57600080fd5b80639f219ec114610240578063b325dd1f14610260578063bbc66a94146102a957600080fd5b806376ea210e116100bd57806376ea210e146101875780638d24fc51146101d2578063918f86741461022f57600080fd5b8063071b48fc146100e45780631b7aa2db14610117578063495182a614610150575b600080fd5b6101046100f2366004610447565b60016020526000908152604090205481565b6040519081526020015b60405180910390f35b61014e610125366004610469565b73ffffffffffffffffffffffffffffffffffffffff909116600090815260016020526040902055565b005b61014e61015e366004610469565b73ffffffffffffffffffffffffffffffffffffffff909116600090815260026020526040902055565b6101c2610195366004610469565b73ffffffffffffffffffffffffffffffffffffffff91909116600090815260208190526040902055600190565b604051901515815260200161010e565b61014e6101e0366004610447565b73ffffffffffffffffffffffffffffffffffffffff16600090815260036020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055565b61010469d3c21bcecceda100000081565b61010461024e366004610447565b60026020526000908152604090205481565b61014e61026e366004610447565b73ffffffffffffffffffffffffffffffffffffffff1660009081526001602052604090206fffffffffffffffffffffffffffffffff42169055565b6101046102b7366004610447565b73ffffffffffffffffffffffffffffffffffffffff1660009081526002602052604090205490565b6102f26102ed366004610447565b6103b0565b6040805192835260208301919091520161010e565b6101c2610315366004610447565b60036020526000908152604090205460ff1681565b610104610338366004610447565b60006020819052908152604090205481565b610384610358366004610447565b73ffffffffffffffffffffffffffffffffffffffff811660009081526003602052604090205460ff1691565b60408051921515835273ffffffffffffffffffffffffffffffffffffffff90911660208301520161010e565b73ffffffffffffffffffffffffffffffffffffffff811660009081526020819052604081205481901561041357505073ffffffffffffffffffffffffffffffffffffffff166000908152602081905260409020549069d3c21bcecceda100000090565b506000928392509050565b803573ffffffffffffffffffffffffffffffffffffffff8116811461044257600080fd5b919050565b60006020828403121561045957600080fd5b6104628261041e565b9392505050565b6000806040838503121561047c57600080fd5b6104858361041e565b94602093909301359350505056fea164736f6c6343000818000a
diff --git a/contracts/celo/compiled/SortedOracles.abi b/contracts/celo/compiled/SortedOracles.abi
deleted file mode 100644
index b8b5d8e93f..0000000000
--- a/contracts/celo/compiled/SortedOracles.abi
+++ /dev/null
@@ -1,657 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "bool",
-        "name": "test",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "MedianUpdated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "oracleAddress",
-        "type": "address"
-      }
-    ],
-    "name": "OracleAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "oracleAddress",
-        "type": "address"
-      }
-    ],
-    "name": "OracleRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "oracle",
-        "type": "address"
-      }
-    ],
-    "name": "OracleReportRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "oracle",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "timestamp",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "OracleReported",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "reportExpiry",
-        "type": "uint256"
-      }
-    ],
-    "name": "ReportExpirySet",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "reportExpiry",
-        "type": "uint256"
-      }
-    ],
-    "name": "TokenReportExpirySet",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "oracleAddress",
-        "type": "address"
-      }
-    ],
-    "name": "addOracle",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getOracles",
-    "outputs": [
-      {
-        "internalType": "address[]",
-        "name": "",
-        "type": "address[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getRates",
-    "outputs": [
-      {
-        "internalType": "address[]",
-        "name": "",
-        "type": "address[]"
-      },
-      {
-        "internalType": "uint256[]",
-        "name": "",
-        "type": "uint256[]"
-      },
-      {
-        "internalType": "enum SortedLinkedListWithMedian.MedianRelation[]",
-        "name": "",
-        "type": "uint8[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTimestamps",
-    "outputs": [
-      {
-        "internalType": "address[]",
-        "name": "",
-        "type": "address[]"
-      },
-      {
-        "internalType": "uint256[]",
-        "name": "",
-        "type": "uint256[]"
-      },
-      {
-        "internalType": "enum SortedLinkedListWithMedian.MedianRelation[]",
-        "name": "",
-        "type": "uint8[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "getTokenReportExpirySeconds",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getVersionNumber",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_reportExpirySeconds",
-        "type": "uint256"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "initialized",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "isOldestReportExpired",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      },
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "isOracle",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "medianRate",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "medianTimestamp",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "numRates",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      }
-    ],
-    "name": "numTimestamps",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "oracles",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "n",
-        "type": "uint256"
-      }
-    ],
-    "name": "removeExpiredReports",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "oracleAddress",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "index",
-        "type": "uint256"
-      }
-    ],
-    "name": "removeOracle",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "renounceOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      },
-      {
-        "internalType": "address",
-        "name": "lesserKey",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "greaterKey",
-        "type": "address"
-      }
-    ],
-    "name": "report",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "reportExpirySeconds",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_reportExpirySeconds",
-        "type": "uint256"
-      }
-    ],
-    "name": "setReportExpiry",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_reportExpirySeconds",
-        "type": "uint256"
-      }
-    ],
-    "name": "setTokenReportExpiry",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "tokenReportExpirySeconds",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "transferOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
diff --git a/contracts/celo/compiled/SortedOracles.bin-runtime b/contracts/celo/compiled/SortedOracles.bin-runtime
deleted file mode 100644
index bf2fe78ee1..0000000000
--- a/contracts/celo/compiled/SortedOracles.bin-runtime
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b50600436106101a35760003560e01c80638da5cb5b116100ee578063ebc1d6bb11610097578063f2fde38b11610071578063f2fde38b146103f5578063fc20935d14610408578063fe4b84df1461041b578063ffe736bf1461042e57600080fd5b8063ebc1d6bb146103a7578063ef90e1b0146103ba578063f0ca4adb146103e257600080fd5b8063b9292158116100c8578063b92921581461036e578063bbc66a9414610381578063dd34ca3b1461039457600080fd5b80638da5cb5b146102fc5780638e7492811461033b578063a00a8b2c1461035b57600080fd5b806353a57297116101505780636deb67991161012a5780636deb6799146102ce578063715018a6146102e157806380e50744146102e957600080fd5b806353a572971461028057806354255be0146102955780636dd6ef0c146102bb57600080fd5b80632e86bc01116101815780632e86bc0114610229578063370c998e14610249578063493a353c1461027757600080fd5b806302f55b61146101a8578063071b48fc146101d3578063158ef93e146101f4575b600080fd5b6101bb6101b636600461255a565b61046d565b6040516101ca939291906125c8565b60405180910390f35b6101e66101e136600461255a565b61055c565b6040519081526020016101ca565b6000546102199074010000000000000000000000000000000000000000900460ff1681565b60405190151581526020016101ca565b6101e661023736600461255a565b60066020526000908152604090205481565b61021961025736600461268f565b600360209081526000928352604080842090915290825290205460ff1681565b6101e660055481565b61029361028e3660046126c8565b610616565b005b6001806002806040805194855260208501939093529183015260608201526080016101ca565b6101e66102c936600461255a565b6109ab565b6101e66102dc36600461255a565b610a22565b610293610a7f565b6102936102f7366004612709565b610a93565b60005473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016101ca565b61034e61034936600461255a565b6111bc565b6040516101ca919061275c565b61031661036936600461276f565b61124c565b6101bb61037c36600461255a565b611291565b6101e661038f36600461255a565b611310565b6102936103a236600461276f565b611387565b6102936103b536600461279b565b61153b565b6103cd6103c836600461255a565b61169f565b604080519283526020830191909152016101ca565b6102936103f036600461268f565b611783565b61029361040336600461255a565b611981565b61029361041636600461276f565b611a38565b61029361042936600461279b565b611be9565b61044161043c36600461255a565b611cbf565b60408051921515835273ffffffffffffffffffffffffffffffffffffffff9091166020830152016101ca565b73ffffffffffffffffffffffffffffffffffffffff81166000908152600160205260409081902090517f6cfa38730000000000000000000000000000000000000000000000000000000081526060918291829173__$c0b499b413513d0c67e2a6a17d90846cb3$__91636cfa3873916104ec9160040190815260200190565b600060405180830381865af4158015610509573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016820160405261054f919081019061292a565b9250925092509193909250565b73ffffffffffffffffffffffffffffffffffffffff811660009081526002602052604080822090517f59d556a8000000000000000000000000000000000000000000000000000000008152600481019190915273__$c0b499b413513d0c67e2a6a17d90846cb3$__906359d556a8906024015b602060405180830381865af41580156105ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106109190612a13565b92915050565b61061e611ee3565b73ffffffffffffffffffffffffffffffffffffffff831615801590610658575073ffffffffffffffffffffffffffffffffffffffff821615155b8015610688575073ffffffffffffffffffffffffffffffffffffffff831660009081526004602052604090205481105b80156106ef575073ffffffffffffffffffffffffffffffffffffffff8381166000908152600460205260409020805491841691839081106106cb576106cb612a2c565b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff16145b6107a6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152605660248201527f746f6b656e2061646472206e756c6c206f72206f7261636c652061646472206e60448201527f756c6c206f7220696e646578206f6620746f6b656e206f7261636c65206e6f7460648201527f206d617070656420746f206f7261636c65206164647200000000000000000000608482015260a4015b60405180910390fd5b73ffffffffffffffffffffffffffffffffffffffff8084166000818152600360209081526040808320948716835293815283822080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00169055918152600490915220805461081790600190612a8a565b8154811061082757610827612a2c565b600091825260208083209091015473ffffffffffffffffffffffffffffffffffffffff86811684526004909252604090922080549190921691908390811061087157610871612a2c565b600091825260208083209190910180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff94851617905591851681526004909152604090208054806108db576108db612a9d565b60008281526020902081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90810180547fffffffffffffffffffffffff000000000000000000000000000000000000000016905501905561093d8383611f64565b1561094c5761094c8383612105565b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f6dc84b66cc948d847632b9d829f7cb1cb904fbf2c084554a9bc22ad9d845334060405160405180910390a3505050565b73ffffffffffffffffffffffffffffffffffffffff811660009081526002602052604080822090517f6eafa6c3000000000000000000000000000000000000000000000000000000008152600481019190915273__$c0b499b413513d0c67e2a6a17d90846cb3$__90636eafa6c3906024016105cf565b73ffffffffffffffffffffffffffffffffffffffff81166000908152600660205260408120548103610a5657505060055490565b5073ffffffffffffffffffffffffffffffffffffffff1660009081526006602052604090205490565b610a87611ee3565b610a9160006124c3565b565b73ffffffffffffffffffffffffffffffffffffffff84166000908152600360209081526040808320338452909152902054849060ff16610b55576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602760248201527f73656e64657220776173206e6f7420616e206f7261636c6520666f7220746f6b60448201527f656e206164647200000000000000000000000000000000000000000000000000606482015260840161079d565b73ffffffffffffffffffffffffffffffffffffffff851660009081526001602052604080822090517f59d556a8000000000000000000000000000000000000000000000000000000008152600481019190915273__$c0b499b413513d0c67e2a6a17d90846cb3$__906359d556a890602401602060405180830381865af4158015610be4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c089190612a13565b73ffffffffffffffffffffffffffffffffffffffff87166000908152600160205260409081902090517f95073a79000000000000000000000000000000000000000000000000000000008152600481019190915233602482015290915073__$c0b499b413513d0c67e2a6a17d90846cb3$__906395073a7990604401602060405180830381865af4158015610ca1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cc59190612acc565b15610e395773ffffffffffffffffffffffffffffffffffffffff8681166000908152600160205260409081902090517f832a21470000000000000000000000000000000000000000000000000000000081526004810191909152336024820152604481018790528582166064820152908416608482015273__$c0b499b413513d0c67e2a6a17d90846cb3$__9063832a21479060a40160006040518083038186803b158015610d7357600080fd5b505af4158015610d87573d6000803e3d6000fd5b5050505073ffffffffffffffffffffffffffffffffffffffff86166000908152600260205260409081902090517fc1e728e9000000000000000000000000000000000000000000000000000000008152600481019190915233602482015273__$c0b499b413513d0c67e2a6a17d90846cb3$__9063c1e728e99060440160006040518083038186803b158015610e1c57600080fd5b505af4158015610e30573d6000803e3d6000fd5b50505050610efb565b73ffffffffffffffffffffffffffffffffffffffff8681166000908152600160205260409081902090517fd4a092720000000000000000000000000000000000000000000000000000000081526004810191909152336024820152604481018790528582166064820152908416608482015273__$c0b499b413513d0c67e2a6a17d90846cb3$__9063d4a092729060a40160006040518083038186803b158015610ee257600080fd5b505af4158015610ef6573d6000803e3d6000fd5b505050505b73ffffffffffffffffffffffffffffffffffffffff86166000908152600260205260409081902090517f0944c5940000000000000000000000000000000000000000000000000000000081526004810182905273__$c0b499b413513d0c67e2a6a17d90846cb3$__9163d4a0927291339042908590630944c59490602401602060405180830381865af4158015610f96573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610fba9190612aee565b6040517fffffffff0000000000000000000000000000000000000000000000000000000060e087901b168152600481019490945273ffffffffffffffffffffffffffffffffffffffff928316602485015260448401919091521660648201526000608482015260a40160006040518083038186803b15801561103b57600080fd5b505af415801561104f573d6000803e3d6000fd5b5050604080514281526020810189905233935073ffffffffffffffffffffffffffffffffffffffff8a1692507f7cebb17173a9ed273d2b7538f64395c0ebf352ff743f1cf8ce66b437a6144213910160405180910390a373ffffffffffffffffffffffffffffffffffffffff861660009081526001602052604080822090517f59d556a8000000000000000000000000000000000000000000000000000000008152600481019190915273__$c0b499b413513d0c67e2a6a17d90846cb3$__906359d556a890602401602060405180830381865af4158015611135573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111599190612a13565b90508181146111b3578673ffffffffffffffffffffffffffffffffffffffff167fa9981ebfc3b766a742486e898f54959b050a66006dbce1a4155c1f84a08bcf41826040516111aa91815260200190565b60405180910390a25b50505050505050565b73ffffffffffffffffffffffffffffffffffffffff811660009081526004602090815260409182902080548351818402810184019094528084526060939283018282801561124057602002820191906000526020600020905b815473ffffffffffffffffffffffffffffffffffffffff168152600190910190602001808311611215575b50505050509050919050565b6004602052816000526040600020818154811061126857600080fd5b60009182526020909120015473ffffffffffffffffffffffffffffffffffffffff169150829050565b73ffffffffffffffffffffffffffffffffffffffff81166000908152600260205260409081902090517f6cfa38730000000000000000000000000000000000000000000000000000000081526060918291829173__$c0b499b413513d0c67e2a6a17d90846cb3$__91636cfa3873916104ec9160040190815260200190565b73ffffffffffffffffffffffffffffffffffffffff811660009081526001602052604080822090517f6eafa6c3000000000000000000000000000000000000000000000000000000008152600481019190915273__$c0b499b413513d0c67e2a6a17d90846cb3$__90636eafa6c3906024016105cf565b73ffffffffffffffffffffffffffffffffffffffff82161580159061145e575073ffffffffffffffffffffffffffffffffffffffff82166000908152600260205260409081902090517f6eafa6c3000000000000000000000000000000000000000000000000000000008152600481019190915273__$c0b499b413513d0c67e2a6a17d90846cb3$__90636eafa6c390602401602060405180830381865af4158015611437573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061145b9190612a13565b81105b6114ea576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603460248201527f746f6b656e2061646472206e756c6c206f7220747279696e6720746f2072656d60448201527f6f766520746f6f206d616e79207265706f727473000000000000000000000000606482015260840161079d565b60005b818110156115365760008061150185611cbf565b91509150811561151a576115158582612105565b611521565b5050505050565b5050808061152e90612b0b565b9150506114ed565b505050565b611543611ee3565b600081116115d3576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f7265706f727420657870697279207365636f6e6473206d757374206265203e2060448201527f3000000000000000000000000000000000000000000000000000000000000000606482015260840161079d565b6005548103611664576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602260248201527f7265706f72744578706972795365636f6e6473206861736e2774206368616e6760448201527f6564000000000000000000000000000000000000000000000000000000000000606482015260840161079d565b60058190556040518181527fc68a9b88effd8a11611ff410efbc83569f0031b7bc70dd455b61344c7f0a042f9060200160405180910390a150565b73ffffffffffffffffffffffffffffffffffffffff811660009081526001602052604080822090517f59d556a8000000000000000000000000000000000000000000000000000000008152829173__$c0b499b413513d0c67e2a6a17d90846cb3$__916359d556a8916117189160040190815260200190565b602060405180830381865af4158015611735573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117599190612a13565b61176284611310565b156117775769d3c21bcecceda100000061177a565b60005b91509150915091565b61178b611ee3565b73ffffffffffffffffffffffffffffffffffffffff8216158015906117c5575073ffffffffffffffffffffffffffffffffffffffff811615155b8015611804575073ffffffffffffffffffffffffffffffffffffffff80831660009081526003602090815260408083209385168352929052205460ff16155b6118b6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152605a60248201527f746f6b656e206164647220776173206e756c6c206f72206f7261636c6520616460448201527f647220776173206e756c6c206f72206f7261636c652061646472206973206e6f60648201527f7420616e206f7261636c6520666f7220746f6b656e2061646472000000000000608482015260a40161079d565b73ffffffffffffffffffffffffffffffffffffffff808316600081815260036020908152604080832094861680845294825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660019081179091558484526004835281842080549182018155845291832090910180547fffffffffffffffffffffffff00000000000000000000000000000000000000001685179055517f828d2be040dede7698182e08dfa8bfbd663c879aee772509c4a2bd961d0ed43f9190a35050565b611989611ee3565b73ffffffffffffffffffffffffffffffffffffffff8116611a2c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f6464726573730000000000000000000000000000000000000000000000000000606482015260840161079d565b611a35816124c3565b50565b611a40611ee3565b60008111611ad0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f7265706f727420657870697279207365636f6e6473206d757374206265203e2060448201527f3000000000000000000000000000000000000000000000000000000000000000606482015260840161079d565b73ffffffffffffffffffffffffffffffffffffffff82166000908152600660205260409020548103611b84576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f746f6b656e207265706f72744578706972795365636f6e6473206861736e277460448201527f206368616e676564000000000000000000000000000000000000000000000000606482015260840161079d565b73ffffffffffffffffffffffffffffffffffffffff8216600081815260066020908152604091829020849055815192835282018390527ff8324c8592dfd9991ee3e717351afe0a964605257959e3d99b0eb3d45bff9422910160405180910390a15050565b60005474010000000000000000000000000000000000000000900460ff1615611c6e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f636f6e747261637420616c726561647920696e697469616c697a656400000000604482015260640161079d565b600080547fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff1674010000000000000000000000000000000000000000179055611cb6336124c3565b611a358161153b565b60008073ffffffffffffffffffffffffffffffffffffffff8316611d3f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601c60248201527f746f6b656e20616464726573732063616e6e6f74206265206e756c6c00000000604482015260640161079d565b73ffffffffffffffffffffffffffffffffffffffff831660009081526002602052604080822090517fd938ec7b000000000000000000000000000000000000000000000000000000008152600481019190915273__$c0b499b413513d0c67e2a6a17d90846cb3$__9063d938ec7b90602401602060405180830381865af4158015611dce573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611df29190612aee565b73ffffffffffffffffffffffffffffffffffffffff85811660009081526002602052604080822090517f7c6bb8620000000000000000000000000000000000000000000000000000000081526004810191909152918316602483015291925073__$c0b499b413513d0c67e2a6a17d90846cb3$__90637c6bb86290604401602060405180830381865af4158015611e8d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611eb19190612a13565b9050611ebc85610a22565b611ec68242612a8a565b10611ed75750600194909350915050565b50600094909350915050565b60005473ffffffffffffffffffffffffffffffffffffffff163314610a91576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604482015260640161079d565b73ffffffffffffffffffffffffffffffffffffffff821660009081526001602052604080822090517f95073a7900000000000000000000000000000000000000000000000000000000815273__$c0b499b413513d0c67e2a6a17d90846cb3$__916395073a7991611ff99190869060040191825273ffffffffffffffffffffffffffffffffffffffff16602082015260400190565b602060405180830381865af4158015612016573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061203a9190612acc565b80156120fe575073ffffffffffffffffffffffffffffffffffffffff8381166000908152600260205260409081902090517f95073a790000000000000000000000000000000000000000000000000000000081526004810191909152908316602482015273__$c0b499b413513d0c67e2a6a17d90846cb3$__906395073a7990604401602060405180830381865af41580156120da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120fe9190612acc565b9392505050565b61210e826109ab565b600114801561212257506121228282611f64565b1561212b575050565b73ffffffffffffffffffffffffffffffffffffffff821660009081526001602052604080822090517f59d556a8000000000000000000000000000000000000000000000000000000008152600481019190915273__$c0b499b413513d0c67e2a6a17d90846cb3$__906359d556a890602401602060405180830381865af41580156121ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121de9190612a13565b73ffffffffffffffffffffffffffffffffffffffff84166000908152600160205260409081902090517fc1e728e900000000000000000000000000000000000000000000000000000000815291925073__$c0b499b413513d0c67e2a6a17d90846cb3$__9163c1e728e99161227691869060040191825273ffffffffffffffffffffffffffffffffffffffff16602082015260400190565b60006040518083038186803b15801561228e57600080fd5b505af41580156122a2573d6000803e3d6000fd5b50505073ffffffffffffffffffffffffffffffffffffffff84166000908152600260205260409081902090517fc1e728e900000000000000000000000000000000000000000000000000000000815273__$c0b499b413513d0c67e2a6a17d90846cb3$__925063c1e728e99161233b91869060040191825273ffffffffffffffffffffffffffffffffffffffff16602082015260400190565b60006040518083038186803b15801561235357600080fd5b505af4158015612367573d6000803e3d6000fd5b505060405173ffffffffffffffffffffffffffffffffffffffff8086169350861691507fe21a44017b6fa1658d84e937d56ff408501facdb4ff7427c479ac460d76f789390600090a373ffffffffffffffffffffffffffffffffffffffff831660009081526001602052604080822090517f59d556a8000000000000000000000000000000000000000000000000000000008152600481019190915273__$c0b499b413513d0c67e2a6a17d90846cb3$__906359d556a890602401602060405180830381865af415801561243f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124639190612a13565b90508181146124bd578373ffffffffffffffffffffffffffffffffffffffff167fa9981ebfc3b766a742486e898f54959b050a66006dbce1a4155c1f84a08bcf41826040516124b491815260200190565b60405180910390a25b50505050565b6000805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b73ffffffffffffffffffffffffffffffffffffffff81168114611a3557600080fd5b60006020828403121561256c57600080fd5b81356120fe81612538565b600081518084526020808501945080840160005b838110156125bd57815173ffffffffffffffffffffffffffffffffffffffff168752958201959082019060010161258b565b509495945050505050565b6060815260006125db6060830186612577565b82810360208481019190915285518083528682019282019060005b81811015612612578451835293830193918301916001016125f6565b50508481036040860152855180825290820192508186019060005b81811015612681578251600480821061266e577f4e487b71000000000000000000000000000000000000000000000000000000006000526021815260246000fd5b508552938301939183019160010161262d565b509298975050505050505050565b600080604083850312156126a257600080fd5b82356126ad81612538565b915060208301356126bd81612538565b809150509250929050565b6000806000606084860312156126dd57600080fd5b83356126e881612538565b925060208401356126f881612538565b929592945050506040919091013590565b6000806000806080858703121561271f57600080fd5b843561272a81612538565b935060208501359250604085013561274181612538565b9150606085013561275181612538565b939692955090935050565b6020815260006120fe6020830184612577565b6000806040838503121561278257600080fd5b823561278d81612538565b946020939093013593505050565b6000602082840312156127ad57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff8111828210171561282a5761282a6127b4565b604052919050565b600067ffffffffffffffff82111561284c5761284c6127b4565b5060051b60200190565b600082601f83011261286757600080fd5b8151602061287c61287783612832565b6127e3565b82815260059290921b8401810191818101908684111561289b57600080fd5b8286015b848110156128b6578051835291830191830161289f565b509695505050505050565b600082601f8301126128d257600080fd5b815160206128e261287783612832565b82815260059290921b8401810191818101908684111561290157600080fd5b8286015b848110156128b65780516004811061291d5760008081fd5b8352918301918301612905565b60008060006060848603121561293f57600080fd5b835167ffffffffffffffff8082111561295757600080fd5b818601915086601f83011261296b57600080fd5b8151602061297b61287783612832565b82815260059290921b8401810191818101908a84111561299a57600080fd5b948201945b838610156129c15785516129b281612538565b8252948201949082019061299f565b918901519197509093505050808211156129da57600080fd5b6129e687838801612856565b935060408601519150808211156129fc57600080fd5b50612a09868287016128c1565b9150509250925092565b600060208284031215612a2557600080fd5b5051919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b8181038181111561061057610610612a5b565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b600060208284031215612ade57600080fd5b815180151581146120fe57600080fd5b600060208284031215612b0057600080fd5b81516120fe81612538565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203612b3c57612b3c612a5b565b506001019056fea164736f6c6343000813000a
diff --git a/core/celo_genesis.go b/core/celo_genesis.go
index 326ec71f9f..9090dc0c72 100644
--- a/core/celo_genesis.go
+++ b/core/celo_genesis.go
@@ -72,14 +72,6 @@ func celoGenesisAccounts(fundedAddr common.Address) GenesisAlloc {
 	if err != nil {
 		panic(err)
 	}
-	sortedOraclesBytecode, err := DecodeHex(celo.MockSortedOraclesBytecodeRaw)
-	if err != nil {
-		panic(err)
-	}
-	feeCurrencyWhitelistBytecode, err := DecodeHex(celo.FeeCurrencyWhitelistBytecodeRaw)
-	if err != nil {
-		panic(err)
-	}
 	feeCurrencyBytecode, err := DecodeHex(celo.FeeCurrencyBytecodeRaw)
 	if err != nil {
 		panic(err)
@@ -93,12 +85,9 @@ func celoGenesisAccounts(fundedAddr common.Address) GenesisAlloc {
 		panic(err)
 	}
 
-	var devBalance32, rateNumerator32, rateNumerator2_32 common.Hash
+	var devBalance32 common.Hash
 	DevBalance.FillBytes(devBalance32[:])
-	rateNumerator.FillBytes(rateNumerator32[:])
-	rateNumerator2.FillBytes(rateNumerator2_32[:])
 
-	arrayAtSlot1 := crypto.Keccak256Hash(common.HexToHash("0x1").Bytes())
 	arrayAtSlot2 := crypto.Keccak256Hash(common.HexToHash("0x2").Bytes())
 
 	faucetBalance, ok := new(big.Int).SetString("500000000000000000000000000", 10) // 500M
@@ -131,24 +120,6 @@ func celoGenesisAccounts(fundedAddr common.Address) GenesisAlloc {
 			Code:    goldTokenBytecode,
 			Balance: big.NewInt(0),
 		},
-		contracts.FeeCurrencyWhitelistAddress: {
-			Code:    feeCurrencyWhitelistBytecode,
-			Balance: big.NewInt(0),
-			Storage: map[common.Hash]common.Hash{
-				common.HexToHash("0x0"):  DevAddr32,                                       // `_owner` slot
-				common.HexToHash("0x1"):  common.HexToHash("0x2"),                         // array length 2
-				arrayAtSlot1:             common.BytesToHash(DevFeeCurrencyAddr.Bytes()),  // FeeCurrency
-				incHash(arrayAtSlot1, 1): common.BytesToHash(DevFeeCurrencyAddr2.Bytes()), // FeeCurrency2
-			},
-		},
-		contracts.SortedOraclesAddress: {
-			Code:    sortedOraclesBytecode,
-			Balance: big.NewInt(0),
-			Storage: map[common.Hash]common.Hash{
-				CalcMapAddr(common.HexToHash("0x0"), common.BytesToHash(DevFeeCurrencyAddr.Bytes())):  rateNumerator32,   // numerators[DevFeeCurrencyAddr]
-				CalcMapAddr(common.HexToHash("0x0"), common.BytesToHash(DevFeeCurrencyAddr2.Bytes())): rateNumerator2_32, // numerators[DevFeeCurrencyAddr2]
-			},
-		},
 		DevFeeCurrencyAddr: {
 			Code:    feeCurrencyBytecode,
 			Balance: big.NewInt(0),
diff --git a/e2e_test/debug-fee-currency/deploy_and_send_tx.sh b/e2e_test/debug-fee-currency/deploy_and_send_tx.sh
index 0dc87e8b41..6787f16753 100755
--- a/e2e_test/debug-fee-currency/deploy_and_send_tx.sh
+++ b/e2e_test/debug-fee-currency/deploy_and_send_tx.sh
@@ -7,7 +7,6 @@ export FEE_CURRENCY=$(\
 	| jq .deployedTo -r)
 
 cast send --private-key $ACC_PRIVKEY $FEE_CURRENCY_DIRECTORY_ADDR 'setCurrencyConfig(address, address, address, uint256)' $FEE_CURRENCY $FEE_CURRENCY $ORACLE 60000 --legacy
-cast send --private-key $ACC_PRIVKEY $SORTED_ORACLES_ADDR 'setMedianRate(address, uint256)' $FEE_CURRENCY 2000000000000000000000000 --legacy
 echo Fee currency: $FEE_CURRENCY
 
 (cd ../js-tests/ && ./send_tx.mjs "$(cast chain-id)" $ACC_PRIVKEY $FEE_CURRENCY)
diff --git a/e2e_test/shared.sh b/e2e_test/shared.sh
index 3ba061c242..2fe9c4e313 100644
--- a/e2e_test/shared.sh
+++ b/e2e_test/shared.sh
@@ -7,9 +7,7 @@ export ACC_ADDR=0x42cf1bbc38BaAA3c4898ce8790e21eD2738c6A4a
 export ACC_PRIVKEY=0x2771aff413cac48d9f8c114fabddd9195a2129f3c2c436caa07e27bb7f58ead5
 export REGISTRY_ADDR=0x000000000000000000000000000000000000ce10
 export TOKEN_ADDR=0x471ece3750da237f93b8e339c536989b8978a438
-export FEE_CURRENCY_WHITELIST_ADDR=0xbb024e9cdcb2f9e34d893630d19611b8a5381b3c
 export FEE_CURRENCY_DIRECTORY_ADDR=0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-export SORTED_ORACLES_ADDR=0xefb84935239dacdecf7c5ba76d8de40b077b7b33
 export FEE_CURRENCY=0x000000000000000000000000000000000000ce16
 export FEE_HANDLER=0xcd437749e43a154c07f3553504c68fbfd56b8778
 export ORACLE=0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb0001