Per title, doesn't seem right that this logic lives in `api` package. Remove.
Per title, doesn't seem right that this logic lives in
apipackage. Remove.