Miscellaneous app cleanup (#7594)

* app cleanup

* whoops, forgot a file

* some minor cleanup

* longer container deadline

* defensive checks

app/websocket_router.go

@@ -21,13 +21,6 @@ type WebSocketRouter struct {
 	handlers map[string]webSocketHandler
 }
 
-func (a *App) NewWebSocketRouter() *WebSocketRouter {
-	return &WebSocketRouter{
-		app:      a,
-		handlers: make(map[string]webSocketHandler),
-	}
-}
-
 func (wr *WebSocketRouter) Handle(action string, handler webSocketHandler) {
 	wr.handlers[action] = handler
 }