diff --git a/geomagio/Controller.py b/geomagio/Controller.py
index 97d46793e1e3786658acbf756b3d67cf63c20d7b..236618176bbaeed9d334b090ce2a0100fb0363d6 100644
--- a/geomagio/Controller.py
+++ b/geomagio/Controller.py
@@ -499,7 +499,6 @@ def get_input_factory(args):
     input_factory_args["observatory"] = args.observatory
     input_factory_args["type"] = args.type
     input_type = args.input
-    input_factory_args["output"] = args.output
     # stream/url arguments
     if args.input_file is not None:
         if input_type in ["netcdf", "miniseed"]:
diff --git a/geomagio/api/ws/data.py b/geomagio/api/ws/data.py
index 1eb735fd54c39d89f7ec75a38dc8725b5cff09b4..c2bc92274c2fca1a9df5b914f81f63fb362ec65f 100644
--- a/geomagio/api/ws/data.py
+++ b/geomagio/api/ws/data.py
@@ -5,7 +5,8 @@ from fastapi import APIRouter, Depends, Query, Request
 from obspy import UTCDateTime, Stream
 from starlette.responses import Response
 
-from ... import DerivedTimeseriesFactory, TimeseriesFactory, TimeseriesUtility
+from ... import TimeseriesFactory, TimeseriesUtility
+from ...DerivedTimeseriesFactory import DerivedTimeseriesFactory
 from ...edge import EdgeFactory, FDSNFactory, MiniSeedFactory
 from ...iaga2002 import IAGA2002Writer
 from ...imfjson import IMFJSONWriter