diff --git a/internal/server/routes.go b/internal/server/routes.go
index 228eb9d..e5ce9e9 100644
--- a/internal/server/routes.go
+++ b/internal/server/routes.go
@@ -53,23 +53,18 @@ func (s *Server) SetupRoutes() {
 	s.router.Route("/api/v1", func(r chi.Router) {
 		r.Get("/server", s.h.HandleServerInfo())
 		r.Post("/register", s.h.HandleRegister())
-		r.Get("/me", s.h.HandleMe())
+
+		// Unified state and message endpoints
+		r.Get("/state", s.h.HandleState())
+		r.Get("/messages", s.h.HandleGetMessages())
+		r.Post("/messages", s.h.HandleSendMessage())
+		r.Get("/history", s.h.HandleGetHistory())
 
 		// Channels
-		r.Get("/channels", s.h.HandleListChannels())
 		r.Get("/channels/all", s.h.HandleListAllChannels())
 		r.Post("/channels/join", s.h.HandleJoinChannel())
-		r.Delete("/channels/{channel}/part", s.h.HandlePartChannel())
+		r.Delete("/channels/{channel}", s.h.HandlePartChannel())
 		r.Get("/channels/{channel}/members", s.h.HandleChannelMembers())
-		r.Get("/channels/{channel}/messages", s.h.HandleGetMessages())
-		r.Post("/channels/{channel}/messages", s.h.HandleSendMessage())
-
-		// DMs
-		r.Get("/dm/{nick}/messages", s.h.HandleGetDMs())
-		r.Post("/dm/{nick}/messages", s.h.HandleSendDM())
-
-		// Polling
-		r.Get("/poll", s.h.HandlePoll())
 	})
 
 	// Serve embedded SPA