diff --git a/packages/server/src/TRPCEffectRuntime.ts b/packages/server/src/TRPCEffectRuntime.ts
index ae3c09e..ddea672 100644
--- a/packages/server/src/TRPCEffectRuntime.ts
+++ b/packages/server/src/TRPCEffectRuntime.ts
@@ -23,33 +23,13 @@ export const TRPCEffectRuntimeLive = Layer.effect(TRPCEffectRuntime,
 
 export const t = initTRPC.create()
 
-// export const run = <
-//     Args extends unknown[],
-//     A, E, R
-// >(
-//     program: (...args: Args) => Effect.Effect<A, E, R>
-// ) => FiberSet.makeRuntime<R>().pipe(
-//     Effect.map(runFork =>
-//         (...args: Args) => runFork(program(...args))
-//     )
-// )
-
 const testRouter = Effect.gen(function*() {
     const run = yield* TRPCEffectRuntime
 
     return t.router({
-        // test1: t.procedure.query(
-        //     yield* run((opts) => Effect.gen(function*() {
-        //         const todos = yield* TodoRepository
-        //         return "test"
-        //     }))
-        // ),
-
-        test1: t.procedure.query(
-            (opts) => run(Effect.gen(function*() {
-                const todos = yield* TodoRepository
-                return "test"
-            }))
-        ),
+        test1: t.procedure.query(() => run(Effect.gen(function*() {
+            const todos = yield* TodoRepository
+            return "test"
+        }))),
     })
 })
diff --git a/packages/server/src/express.ts b/packages/server/src/express.ts
index 4ac33ab..14d94e4 100644
--- a/packages/server/src/express.ts
+++ b/packages/server/src/express.ts
@@ -19,4 +19,6 @@ export const ServerLive = Layer.scopedDiscard(Effect.gen(function*() {
             server.close()
         ),
     )
-}))
+})).pipe(
+    Layer.provide(ExpressLive)
+)