Miscellaneous app cleanup (#7594)

* app cleanup

* whoops, forgot a file

* some minor cleanup

* longer container deadline

* defensive checks

api/api.go

@@ -61,12 +61,6 @@ type API struct {
 	BaseRoutes *Routes
 }
 
-func NewRouter() *mux.Router {
-	ret := mux.NewRouter()
-	ret.NotFoundHandler = http.HandlerFunc(Handle404)
-	return ret
-}
-
 func Init(a *app.App, root *mux.Router) *API {
 	api := &API{
 		App:        a,