diff --git a/service/src/main.rs b/service/src/main.rs
index 0746a81f..894e8dce 100644
--- a/service/src/main.rs
+++ b/service/src/main.rs
@@ -119,18 +119,7 @@ impl IndexerServiceImpl for SubgraphService {
     }
 }
 
-/// Create Indexer service App
-///
-/// Initialization for server and Query processor
-///
-/// Validate that graph-node instance is running for Query processor
-/// Validate that server is running with a health check
-///
-/// Parse Requests received
-///
-/// Route the requests as a FreeQuery
-///
-/// Return response from Query Processor
+/// Run the subgraph indexer service
 #[tokio::main]
 async fn main() -> Result<(), Error> {
     tracing_subscriber::fmt::init();
@@ -190,144 +179,4 @@ async fn main() -> Result<(), Error> {
             .with_state(state),
     })
     .await
-
-    // // Initialize graph-node client
-    // let graph_node = graph_node::GraphNodeInstance::new(
-    //     &config.indexer_infrastructure.graph_node_query_endpoint,
-    // );
-
-    // let http_client = reqwest::Client::builder()
-    //     .tcp_nodelay(true)
-    //     .timeout(Duration::from_secs(30))
-    //     .build()
-    //     .expect("Failed to init HTTP client");
-
-    // // Make an instance of network subgraph at either
-    // // graph_node_query_endpoint/subgraphs/id/network_subgraph_deployment
-    // // or network_subgraph_endpoint
-    // //
-    // // We're leaking the network subgraph here to obtain a reference with
-    // // a static lifetime, which avoids having to pass around and clone `Arc`
-    // // objects everywhere. Since the network subgraph is read-only, this is
-    // // no problem.
-    // let network_subgraph = Box::leak(Box::new(SubgraphClient::new(
-    //     http_client.clone(),
-    //     config
-    //         .network_subgraph
-    //         .network_subgraph_deployment
-    //         .map(|deployment| {
-    //             DeploymentDetails::for_graph_node(
-    //                 &config.indexer_infrastructure.graph_node_status_endpoint,
-    //                 &config.indexer_infrastructure.graph_node_query_endpoint,
-    //                 deployment,
-    //             )
-    //         })
-    //         .transpose()
-    //         .expect("Failed to parse graph node query endpoint and network subgraph deployment"),
-    //     DeploymentDetails::for_query_url(&config.network_subgraph.network_subgraph_endpoint)
-    //         .expect("Failed to parse network subgraph endpoint"),
-    // )));
-
-    // let indexer_allocations = indexer_allocations(
-    //     network_subgraph,
-    //     config.ethereum.indexer_address,
-    //     1,
-    //     Duration::from_millis(config.network_subgraph.allocation_syncing_interval),
-    // );
-
-    // // TODO: Chain ID should be a config
-    // let graph_network_id = 1;
-
-    // let dispute_manager =
-    //     dispute_manager(network_subgraph, graph_network_id, Duration::from_secs(60));
-
-    // let attestation_signers = attestation_signers(
-    //     indexer_allocations.clone(),
-    //     config.ethereum.mnemonic.clone(),
-    //     U256::from(graph_network_id),
-    //     dispute_manager,
-    // );
-
-    // // Establish Database connection necessary for serving indexer management
-    // // requests with defined schema
-    // // Note: Typically, you'd call `sqlx::migrate!();` here to sync the models
-    // // which defaults to files in  "./migrations" to sync the database;
-    // // however, this can cause conflicts with the migrations run by indexer
-    // // agent. Hence we leave syncing and migrating entirely to the agent and
-    // // assume the models are up to date in the service.
-    // let indexer_management_db = database::connect(&config.postgres).await;
-
-    // let escrow_subgraph = Box::leak(Box::new(SubgraphClient::new(
-    //     http_client,
-    //     config
-    //         .escrow_subgraph
-    //         .escrow_subgraph_deployment
-    //         .map(|deployment| {
-    //             DeploymentDetails::for_graph_node(
-    //                 &config.indexer_infrastructure.graph_node_status_endpoint,
-    //                 &config.indexer_infrastructure.graph_node_query_endpoint,
-    //                 deployment,
-    //             )
-    //         })
-    //         .transpose()
-    //         .expect("Failed to parse graph node query endpoint and escrow subgraph deployment"),
-    //     DeploymentDetails::for_query_url(&config.escrow_subgraph.escrow_subgraph_endpoint)
-    //         .expect("Failed to parse escrow subgraph endpoint"),
-    // )));
-
-    // let escrow_accounts = escrow_accounts(
-    //     escrow_subgraph,
-    //     config.ethereum.indexer_address,
-    //     Duration::from_millis(config.escrow_subgraph.escrow_syncing_interval),
-    // );
-
-    // let tap_manager = TapManager::new(
-    //     indexer_management_db.clone(),
-    //     indexer_allocations,
-    //     escrow_accounts,
-    //     // TODO: arguments for eip712_domain should be a config
-    //     eip712_domain! {
-    //         name: "Scalar TAP",
-    //         version: "1",
-    //         chain_id: config.receipts.receipts_verifier_chain_id,
-    //         verifying_contract: config.receipts.receipts_verifier_address,
-    //     },
-    // );
-    // // Proper initiation of server, query processor
-    // // server health check, graph-node instance connection check
-    // let query_processor =
-    //     QueryProcessor::new(graph_node.clone(), attestation_signers.clone(), tap_manager);
-
-    // // Start indexer service basic metrics
-    // tokio::spawn(handle_serve_metrics(
-    //     String::from("0.0.0.0"),
-    //     config.indexer_infrastructure.metrics_port,
-    // ));
-
-    // let service_options = ServerOptions::new(
-    //     Some(config.indexer_infrastructure.port),
-    //     release,
-    //     query_processor,
-    //     config.indexer_infrastructure.free_query_auth_token,
-    //     config.indexer_infrastructure.graph_node_status_endpoint,
-    //     indexer_management_db,
-    //     public_key(&config.ethereum.mnemonic).expect("Failed to initiate with operator wallet"),
-    //     network_subgraph,
-    //     config.network_subgraph.network_subgraph_auth_token,
-    //     config.network_subgraph.serve_network_subgraph,
-    // );
-
-    // info!("Initialized server options");
-    // let app = create_server(service_options).await;
-
-    // let addr = SocketAddr::from_str(&format!("0.0.0.0:{}", config.indexer_infrastructure.port))
-    //     .expect("Start server port");
-    // info!("Initialized server app at {}", addr);
-    // Server::bind(&addr)
-    //     .serve(app.into_make_service())
-    //     .with_graceful_shutdown(shutdown_signal())
-    //     .await
-    //     .unwrap();
-
-    // Ok(())
 }