diff --git a/cmd/XDC/main.go b/cmd/XDC/main.go
index 9641581b9a..0367dd578f 100644
--- a/cmd/XDC/main.go
+++ b/cmd/XDC/main.go
@@ -123,7 +123,6 @@ var (
 		configFileFlag,
 		utils.AnnounceTxsFlag,
 		utils.StoreRewardFlag,
-		utils.RollbackFlag,
 	}
 
 	rpcFlags = []cli.Flag{
@@ -151,7 +150,7 @@ func init() {
 	// Initialize the CLI app and start XDC
 	app.Action = XDC
 	app.HideVersion = true // we have a command to print the version
-	app.Copyright = "Copyright (c) 2018 Xinfin"
+	app.Copyright = "Copyright (c) 2018 XDCchain"
 	app.Commands = []cli.Command{
 		// See chaincmd.go:
 		initCommand,
@@ -351,4 +350,4 @@ func startNode(ctx *cli.Context, stack *node.Node, cfg XDCConfig) {
 			}
 		}()
 	}
-}
\ No newline at end of file
+}
diff --git a/cmd/XDC/usage.go b/cmd/XDC/usage.go
index e10af2f3d8..61ac98ecaa 100644
--- a/cmd/XDC/usage.go
+++ b/cmd/XDC/usage.go
@@ -33,7 +33,7 @@ import (
 var AppHelpTemplate = `NAME:
    {{.App.Name}} - {{.App.Usage}}
 
-   Copyright (c) 2018 Xinfin
+   Copyright (c) 2018 XDCchain
 
 USAGE:
    {{.App.HelpName}} [options]{{if .App.Commands}} command [command options]{{end}} {{if .App.ArgsUsage}}{{.App.ArgsUsage}}{{else}}[arguments...]{{end}}
@@ -65,41 +65,41 @@ type flagGroup struct {
 // AppHelpFlagGroups is the application flags, grouped by functionality.
 var AppHelpFlagGroups = []flagGroup{
 	{
-		Name: "ETHEREUM",
+		Name: "XDCCHAIN",
 		Flags: []cli.Flag{
 			configFileFlag,
 			utils.DataDirFlag,
 			utils.KeyStoreDirFlag,
-			utils.NoUSBFlag,
+			//utils.NoUSBFlag,
 			utils.NetworkIdFlag,
-			utils.TestnetFlag,
-			utils.RinkebyFlag,
+			//utils.TestnetFlag,
+			//utils.RinkebyFlag,
 			utils.SyncModeFlag,
 			utils.GCModeFlag,
 			utils.EthStatsURLFlag,
 			utils.IdentityFlag,
-			utils.LightServFlag,
-			utils.LightPeersFlag,
-			utils.LightKDFFlag,
-		},
-	},
-	{Name: "DEVELOPER CHAIN",
-		Flags: []cli.Flag{
-			utils.DeveloperFlag,
-			utils.DeveloperPeriodFlag,
-		},
-	},
-	{
-		Name: "ETHASH",
-		Flags: []cli.Flag{
-			utils.EthashCacheDirFlag,
-			utils.EthashCachesInMemoryFlag,
-			utils.EthashCachesOnDiskFlag,
-			utils.EthashDatasetDirFlag,
-			utils.EthashDatasetsInMemoryFlag,
-			utils.EthashDatasetsOnDiskFlag,
+			//utils.LightServFlag,
+			//utils.LightPeersFlag,
+			//utils.LightKDFFlag,
 		},
 	},
+	//{Name: "DEVELOPER CHAIN",
+	//	Flags: []cli.Flag{
+	//		utils.DeveloperFlag,
+	//		utils.DeveloperPeriodFlag,
+	//	},
+	//},
+	//{
+	//	Name: "ETHASH",
+	//	Flags: []cli.Flag{
+	//		utils.EthashCacheDirFlag,
+	//		utils.EthashCachesInMemoryFlag,
+	//		utils.EthashCachesOnDiskFlag,
+	//		utils.EthashDatasetDirFlag,
+	//		utils.EthashDatasetsInMemoryFlag,
+	//		utils.EthashDatasetsOnDiskFlag,
+	//	},
+	//},
 	//{
 	//	Name: "DASHBOARD",
 	//	Flags: []cli.Flag{
@@ -110,30 +110,30 @@ var AppHelpFlagGroups = []flagGroup{
 	//		utils.DashboardAssetsFlag,
 	//	},
 	//},
-	{
-		Name: "TRANSACTION POOL",
-		Flags: []cli.Flag{
-			utils.TxPoolNoLocalsFlag,
-			utils.TxPoolJournalFlag,
-			utils.TxPoolRejournalFlag,
-			utils.TxPoolPriceLimitFlag,
-			utils.TxPoolPriceBumpFlag,
-			utils.TxPoolAccountSlotsFlag,
-			utils.TxPoolGlobalSlotsFlag,
-			utils.TxPoolAccountQueueFlag,
-			utils.TxPoolGlobalQueueFlag,
-			utils.TxPoolLifetimeFlag,
-		},
-	},
-	{
-		Name: "PERFORMANCE TUNING",
-		Flags: []cli.Flag{
-			utils.CacheFlag,
-			utils.CacheDatabaseFlag,
-			utils.CacheGCFlag,
-			utils.TrieCacheGenFlag,
-		},
-	},
+	//{
+	//	Name: "TRANSACTION POOL",
+	//	Flags: []cli.Flag{
+	//		utils.TxPoolNoLocalsFlag,
+	//		utils.TxPoolJournalFlag,
+	//		utils.TxPoolRejournalFlag,
+	//		utils.TxPoolPriceLimitFlag,
+	//		utils.TxPoolPriceBumpFlag,
+	//		utils.TxPoolAccountSlotsFlag,
+	//		utils.TxPoolGlobalSlotsFlag,
+	//		utils.TxPoolAccountQueueFlag,
+	//		utils.TxPoolGlobalQueueFlag,
+	//		utils.TxPoolLifetimeFlag,
+	//	},
+	//},
+	//{
+	//	Name: "PERFORMANCE TUNING",
+	//	Flags: []cli.Flag{
+	//		utils.CacheFlag,
+	//		utils.CacheDatabaseFlag,
+	//		utils.CacheGCFlag,
+	//		utils.TrieCacheGenFlag,
+	//	},
+	//},
 	{
 		Name: "ACCOUNT",
 		Flags: []cli.Flag{
@@ -173,14 +173,14 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.MaxPendingPeersFlag,
 			utils.NATFlag,
 			utils.NoDiscoverFlag,
-			utils.DiscoveryV5Flag,
-			utils.NetrestrictFlag,
+			//utils.DiscoveryV5Flag,
+			//utils.NetrestrictFlag,
 			utils.NodeKeyFileFlag,
 			utils.NodeKeyHexFlag,
 		},
 	},
 	{
-		Name: "MINER",
+		Name: "STAKER",
 		Flags: []cli.Flag{
 			utils.StakingEnabledFlag,
 			utils.StakerThreadsFlag,
@@ -190,31 +190,31 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.ExtraDataFlag,
 		},
 	},
-	{
-		Name: "GAS PRICE ORACLE",
-		Flags: []cli.Flag{
-			utils.GpoBlocksFlag,
-			utils.GpoPercentileFlag,
-		},
-	},
-	{
-		Name: "VIRTUAL MACHINE",
-		Flags: []cli.Flag{
-			utils.VMEnableDebugFlag,
-		},
-	},
+	//{
+	//	Name: "GAS PRICE ORACLE",
+	//	Flags: []cli.Flag{
+	//		utils.GpoBlocksFlag,
+	//		utils.GpoPercentileFlag,
+	//	},
+	//},
+	//{
+	//	Name: "VIRTUAL MACHINE",
+	//	Flags: []cli.Flag{
+	//		utils.VMEnableDebugFlag,
+	//	},
+	//},
 	{
 		Name: "LOGGING AND DEBUGGING",
 		Flags: append([]cli.Flag{
 			utils.MetricsEnabledFlag,
-			utils.FakePoWFlag,
-			utils.NoCompactionFlag,
+			//utils.FakePoWFlag,
+			//utils.NoCompactionFlag,
 		}, debug.Flags...),
 	},
-	{
-		Name:  "WHISPER (EXPERIMENTAL)",
-		Flags: whisperFlags,
-	},
+	//{
+	//	Name:  "WHISPER (EXPERIMENTAL)",
+	//	Flags: whisperFlags,
+	//},
 	{
 		Name: "DEPRECATED",
 		Flags: []cli.Flag{