diff --git a/rpc/doc.go b/rpc/doc.go
index e8f8f977b..a2506ad58 100644
--- a/rpc/doc.go
+++ b/rpc/doc.go
@@ -100,129 +100,3 @@ Subscriptions are deleted when:
  - the connection which was used to create the subscription is closed
 */
 package rpc
-
-var (
-	// Mapping between the different methods each api supports
-	AutoCompletion = map[string][]string{
-		"admin": []string{
-			"addPeer",
-			"datadir",
-			"enableUserAgent",
-			"exportChain",
-			"getContractInfo",
-			"httpGet",
-			"importChain",
-			"nodeInfo",
-			"peers",
-			"register",
-			"registerUrl",
-			"saveInfo",
-			"setGlobalRegistrar",
-			"setHashReg",
-			"setUrlHint",
-			"setSolc",
-			"sleep",
-			"sleepBlocks",
-			"startNatSpec",
-			"startRPC",
-			"stopNatSpec",
-			"stopRPC",
-			"verbosity",
-		},
-		"db": []string{
-			"getString",
-			"putString",
-			"getHex",
-			"putHex",
-		},
-		"debug": []string{
-			"dumpBlock",
-			"getBlockRlp",
-			"metrics",
-			"printBlock",
-			"processBlock",
-			"seedHash",
-			"setHead",
-		},
-		"eth": []string{
-			"accounts",
-			"blockNumber",
-			"call",
-			"contract",
-			"coinbase",
-			"compile.lll",
-			"compile.serpent",
-			"compile.solidity",
-			"contract",
-			"defaultAccount",
-			"defaultBlock",
-			"estimateGas",
-			"filter",
-			"getBalance",
-			"getBlock",
-			"getBlockTransactionCount",
-			"getBlockUncleCount",
-			"getCode",
-			"getNatSpec",
-			"getCompilers",
-			"gasPrice",
-			"getStorageAt",
-			"getTransaction",
-			"getTransactionCount",
-			"getTransactionFromBlock",
-			"getTransactionReceipt",
-			"getUncle",
-			"hashrate",
-			"mining",
-			"namereg",
-			"pendingTransactions",
-			"resend",
-			"sendRawTransaction",
-			"sendTransaction",
-			"sign",
-			"syncing",
-		},
-		"miner": []string{
-			"hashrate",
-			"makeDAG",
-			"setEtherbase",
-			"setExtra",
-			"setGasPrice",
-			"startAutoDAG",
-			"start",
-			"stopAutoDAG",
-			"stop",
-		},
-		"net": []string{
-			"peerCount",
-			"listening",
-		},
-		"personal": []string{
-			"listAccounts",
-			"newAccount",
-			"unlockAccount",
-		},
-		"shh": []string{
-			"post",
-			"newIdentity",
-			"hasIdentity",
-			"newGroup",
-			"addToGroup",
-			"filter",
-		},
-		"txpool": []string{
-			"status",
-		},
-		"web3": []string{
-			"sha3",
-			"version",
-			"fromWei",
-			"toWei",
-			"toHex",
-			"toAscii",
-			"fromAscii",
-			"toBigNumber",
-			"isAddress",
-		},
-	}
-)
diff --git a/rpc/javascript.go b/rpc/javascript.go
index 4c0ac5354..72290a2a6 100644
--- a/rpc/javascript.go
+++ b/rpc/javascript.go
@@ -22,7 +22,6 @@ var (
 		"personal": Personal_JS,
 		"txpool":   TxPool_JS,
 		"admin":    Admin_JS,
-		"db":       Db_JS,
 		"eth":      Eth_JS,
 		"miner":    Miner_JS,
 		"debug":    Debug_JS,
@@ -117,12 +116,6 @@ web3._extend({
 			call: 'admin_sleepBlocks',
 			params: 2
 		}),
-		new web3._extend.Method({
-			name: 'verbosity',
-			call: 'admin_verbosity',
-			params: 1,
-			inputFormatter: [web3._extend.utils.fromDecimal]
-		}),
 		new web3._extend.Method({
 			name: 'setSolc',
 			call: 'admin_setSolc',
@@ -217,18 +210,6 @@ web3._extend({
 });
 `
 
-const Db_JS = `
-web3._extend({
-	property: 'db',
-	methods:
-	[
-	],
-	properties:
-	[
-	]
-});
-`
-
 const Eth_JS = `
 web3._extend({
 	property: 'eth',
@@ -278,14 +259,7 @@ web3._extend({
 const Net_JS = `
 web3._extend({
 	property: 'net',
-	methods:
-	[
-		new web3._extend.Method({
-			name: 'addPeer',
-			call: 'net_addPeer',
-			params: 1
-		})
-	],
+	methods: [],
 	properties:
 	[
 		new web3._extend.Property({
@@ -413,9 +387,7 @@ web3._extend({
 			params: 4
 		})
 	],
-	properties:
-	[
-	]
+	properties: []
 });
 `
 
@@ -469,24 +441,14 @@ web3._extend({
 			inputFormatter: [web3._extend.formatters.inputDefaultBlockNumberFormatter]
 		})
 	],
-	properties:
-	[
-		new web3._extend.Property({
-			name: 'hashrate',
-			getter: 'miner_hashrate',
-			outputFormatter: web3._extend.utils.toDecimal
-		})
-	]
+	properties: []
 });
 `
 
 const Shh_JS = `
 web3._extend({
 	property: 'shh',
-	methods:
-	[
-
-	],
+	methods: [],
 	properties:
 	[
 		new web3._extend.Property({