diff --git a/Cargo.lock b/Cargo.lock
index ca306c76..d2869de6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,21 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -71,49 +56,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
-[[package]]
-name = "async-trait"
-version = "0.1.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "auto_impl"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
-[[package]]
-name = "backtrace"
-version = "0.3.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -178,16 +126,10 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
-[[package]]
-name = "bytes"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
-
 [[package]]
 name = "cairo-lang-casm"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-utils",
  "indoc",
@@ -200,7 +142,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-compiler"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "anyhow",
  "cairo-lang-defs",
@@ -225,7 +167,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-debug"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-utils",
 ]
@@ -233,7 +175,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-defs"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-diagnostics",
@@ -249,7 +191,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-diagnostics"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -257,24 +199,10 @@ dependencies = [
  "itertools 0.12.1",
 ]
 
-[[package]]
-name = "cairo-lang-doc"
-version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
-dependencies = [
- "cairo-lang-defs",
- "cairo-lang-formatter",
- "cairo-lang-parser",
- "cairo-lang-syntax",
- "cairo-lang-utils",
- "itertools 0.12.1",
- "rust-analyzer-salsa",
-]
-
 [[package]]
 name = "cairo-lang-eq-solver"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-utils",
  "good_lp",
@@ -283,7 +211,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-filesystem"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-utils",
@@ -297,7 +225,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-formatter"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "anyhow",
  "cairo-lang-diagnostics",
@@ -314,45 +242,10 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cairo-lang-language-server"
-version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
-dependencies = [
- "anyhow",
- "cairo-lang-compiler",
- "cairo-lang-defs",
- "cairo-lang-diagnostics",
- "cairo-lang-doc",
- "cairo-lang-filesystem",
- "cairo-lang-formatter",
- "cairo-lang-lowering",
- "cairo-lang-parser",
- "cairo-lang-project",
- "cairo-lang-semantic",
- "cairo-lang-starknet",
- "cairo-lang-syntax",
- "cairo-lang-test-plugin",
- "cairo-lang-utils",
- "indent",
- "indoc",
- "itertools 0.12.1",
- "rust-analyzer-salsa",
- "scarb-metadata",
- "serde",
- "serde_json",
- "smol_str",
- "tokio",
- "tower-lsp",
- "tracing",
- "tracing-chrome",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "cairo-lang-lowering"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -375,7 +268,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-parser"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
@@ -394,7 +287,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-plugins"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
@@ -412,7 +305,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-proc-macros"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-debug",
  "quote",
@@ -422,7 +315,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-project"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-utils",
@@ -435,7 +328,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-semantic"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -460,7 +353,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "anyhow",
  "cairo-lang-utils",
@@ -486,7 +379,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-ap-change"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -501,7 +394,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-gas"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -516,7 +409,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-generator"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -539,7 +432,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-to-casm"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "assert_matches",
  "cairo-lang-casm",
@@ -559,7 +452,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-type-size"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-sierra",
  "cairo-lang-utils",
@@ -568,7 +461,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-starknet"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -597,7 +490,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-starknet-classes"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-casm",
  "cairo-lang-sierra",
@@ -619,7 +512,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -634,7 +527,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax-codegen"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "genco",
  "xshell",
@@ -643,7 +536,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-plugin"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -669,7 +562,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-utils"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "cairo-lang-formatter",
  "cairo-lang-utils",
@@ -681,7 +574,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-utils"
 version = "2.7.1"
-source = "git+https://github.com/0xLucqs/cairo?branch=lucas/multiline_diag#a83cae9aaab5ad815db17bc1901218383c34c1df"
+source = "git+https://github.com/starkware-libs/cairo?branch=main#aaad921bba52e729dc24ece07fab2edf09ccfa15"
 dependencies = [
  "hashbrown 0.14.5",
  "indexmap 2.4.0",
@@ -700,7 +593,6 @@ dependencies = [
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
- "cairo-lang-language-server",
  "cairo-lang-lowering",
  "cairo-lang-parser",
  "cairo-lang-semantic",
@@ -718,7 +610,6 @@ dependencies = [
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
- "cairo-lang-language-server",
  "cairo-lang-lowering",
  "cairo-lang-parser",
  "cairo-lang-semantic",
@@ -733,7 +624,6 @@ dependencies = [
  "log",
  "paste",
  "pretty_assertions",
- "regex",
  "salsa",
  "test-case",
 ]
@@ -757,24 +647,6 @@ dependencies = [
  "paste",
 ]
 
-[[package]]
-name = "camino"
-version = "1.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cc"
-version = "1.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
-dependencies = [
- "shlex",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -886,19 +758,6 @@ dependencies = [
  "syn 2.0.75",
 ]
 
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.10",
-]
-
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -995,98 +854,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
 [[package]]
 name = "funty"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
 [[package]]
 name = "genco"
 version = "0.17.9"
@@ -1130,12 +903,6 @@ dependencies = [
  "wasi",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
 [[package]]
 name = "globset"
 version = "0.4.14"
@@ -1145,8 +912,8 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1191,34 +958,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
 [[package]]
 name = "id-arena"
 version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
 
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "ignore"
 version = "0.4.22"
@@ -1229,7 +974,7 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.7",
+ "regex-automata",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -1345,7 +1090,7 @@ dependencies = [
  "petgraph",
  "pico-args",
  "regex",
- "regex-syntax 0.8.4",
+ "regex-syntax",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -1359,7 +1104,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex-automata 0.4.7",
+ "regex-automata",
 ]
 
 [[package]]
@@ -1422,28 +1167,6 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
-[[package]]
-name = "lsp-types"
-version = "0.94.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1"
-dependencies = [
- "bitflags 1.3.2",
- "serde",
- "serde_json",
- "serde_repr",
- "url",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
 [[package]]
 name = "matrixmultiply"
 version = "0.2.4"
@@ -1469,27 +1192,6 @@ dependencies = [
  "sprs",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
-dependencies = [
- "hermit-abi",
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "ndarray"
 version = "0.13.1"
@@ -1567,15 +1269,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "object"
-version = "0.36.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -1680,12 +1373,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
 
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
 [[package]]
 name = "petgraph"
 version = "0.6.5"
@@ -1711,38 +1398,12 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
 [[package]]
 name = "precomputed-hash"
 version = "0.1.1"
@@ -1855,17 +1516,8 @@ checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1876,15 +1528,9 @@ checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.4"
@@ -1926,12 +1572,6 @@ dependencies = [
  "syn 2.0.75",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -1988,19 +1628,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scarb-metadata"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "170ebce1774a85568646ba4096827f898306665187eebd9282fee313e316518d"
-dependencies = [
- "camino",
- "semver",
- "serde",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "schemars"
 version = "0.8.21"
@@ -2084,17 +1711,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_repr"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
 [[package]]
 name = "serde_spanned"
 version = "0.6.7"
@@ -2125,45 +1741,12 @@ dependencies = [
  "keccak",
 ]
 
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "siphasher"
 version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -2179,16 +1762,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "sprs"
 version = "0.7.1"
@@ -2326,16 +1899,6 @@ dependencies = [
  "syn 2.0.75",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -2345,63 +1908,6 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "tinyvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tokio"
-version = "1.39.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "parking_lot 0.12.3",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.19"
@@ -2447,66 +1953,6 @@ dependencies = [
  "winnow 0.6.18",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
-[[package]]
-name = "tower-lsp"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508"
-dependencies = [
- "async-trait",
- "auto_impl",
- "bytes",
- "dashmap",
- "futures",
- "httparse",
- "lsp-types",
- "memchr",
- "serde",
- "serde_json",
- "tokio",
- "tokio-util",
- "tower",
- "tower-lsp-macros",
- "tracing",
-]
-
-[[package]]
-name = "tower-lsp-macros"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.75",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -2529,17 +1975,6 @@ dependencies = [
  "syn 2.0.75",
 ]
 
-[[package]]
-name = "tracing-chrome"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0a738ed5d6450a9fb96e86a23ad808de2b727fd1394585da5cdd6788ffe724"
-dependencies = [
- "serde_json",
- "tracing-core",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.32"
@@ -2547,36 +1982,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
 ]
 
 [[package]]
@@ -2604,27 +2009,12 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"
@@ -2637,24 +2027,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
-[[package]]
-name = "url"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -2717,15 +2089,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
diff --git a/Cargo.toml b/Cargo.toml
index ddd812bb..7f9be016 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,4 +35,7 @@ ctor = "0.2.8"
 paste = "1.0.15"
 itertools = "0.13.0"
 log = "0.4.22"
-regex = "1.10.6"
+clap = "4.5.16"
+anyhow = "1.0.86"
+smol_str = "0.2.2"
+annotate-snippets = "0.11.4"
diff --git a/crates/cairo-lint-cli/Cargo.toml b/crates/cairo-lint-cli/Cargo.toml
index b2acb5e4..bcdeb1e1 100644
--- a/crates/cairo-lint-cli/Cargo.toml
+++ b/crates/cairo-lint-cli/Cargo.toml
@@ -16,5 +16,4 @@ cairo-lang-test-plugin.workspace = true
 cairo-lang-lowering.workspace = true
 cairo-lang-syntax.workspace = true
 cairo-lang-defs.workspace = true
-cairo-lang-language-server.workspace = true
 salsa.workspace = true
diff --git a/crates/cairo-lint-core/Cargo.toml b/crates/cairo-lint-core/Cargo.toml
index 0ff4960a..2f840c60 100644
--- a/crates/cairo-lint-core/Cargo.toml
+++ b/crates/cairo-lint-core/Cargo.toml
@@ -17,10 +17,8 @@ cairo-lang-test-plugin.workspace = true
 cairo-lang-lowering.workspace = true
 cairo-lang-syntax.workspace = true
 cairo-lang-defs.workspace = true
-cairo-lang-language-server.workspace = true
 salsa.workspace = true
 log.workspace = true
-regex.workspace = true
 
 [dev-dependencies]
 indoc.workspace = true