diff --git a/.gitmodules b/.gitmodules
index 18e7b86c..3d228f5c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,3 +14,6 @@
 	path = cereal
 	url = ../../commaai/cereal.git
 
+[submodule "rednose_repo"]
+	path = rednose_repo
+	url = ../../commaai/rednose.git
diff --git a/Dockerfile.openpilot b/Dockerfile.openpilot
index 2a7964aa..a9f58f75 100644
--- a/Dockerfile.openpilot
+++ b/Dockerfile.openpilot
@@ -88,6 +88,7 @@ COPY ./common /tmp/openpilot/common
 COPY ./opendbc /tmp/openpilot/opendbc
 COPY ./cereal /tmp/openpilot/cereal
 COPY ./panda /tmp/openpilot/panda
+COPY ./rednose /tmp/openpilot/rednose
 COPY ./selfdrive /tmp/openpilot/selfdrive
 
 COPY SConstruct /tmp/openpilot/SConstruct
diff --git a/SConstruct b/SConstruct
index 25588dce..f6024a0f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -227,7 +227,7 @@ SConscript(['selfdrive/ui/SConscript'])
 SConscript(['selfdrive/loggerd/SConscript'])
 
 SConscript(['selfdrive/locationd/SConscript'])
-SConscript(['selfdrive/locationd/kalman/SConscript'])
+SConscript(['selfdrive/locationd/models/SConscript'])
 
 if arch == "aarch64":
   SConscript(['selfdrive/logcatd/SConscript'])
@@ -235,4 +235,3 @@ if arch == "aarch64":
   SConscript(['selfdrive/clocksd/SConscript'])
 else:
   SConscript(['tools/lib/index_log/SConscript'])
-
diff --git a/rednose b/rednose
new file mode 120000
index 00000000..674cfec3
--- /dev/null
+++ b/rednose
@@ -0,0 +1 @@
+rednose_repo/rednose
\ No newline at end of file
diff --git a/rednose_repo b/rednose_repo
new file mode 160000
index 00000000..d3a79c6a
--- /dev/null
+++ b/rednose_repo
@@ -0,0 +1 @@
+Subproject commit d3a79c6a421b4eec952eeb8d1546a4c3c3ff030e
diff --git a/release/files_common b/release/files_common
index 5257a3a6..1ca68db6 100644
--- a/release/files_common
+++ b/release/files_common
@@ -260,14 +260,11 @@ selfdrive/locationd/test/*.py
 
 selfdrive/locationd/locationd.py
 selfdrive/locationd/paramsd.py
-selfdrive/locationd/kalman/.gitignore
-selfdrive/locationd/kalman/__init__.py
-selfdrive/locationd/kalman/README.md
-selfdrive/locationd/kalman/SConscript
-selfdrive/locationd/kalman/templates/*
-selfdrive/locationd/kalman/helpers/*
-selfdrive/locationd/kalman/models/live_kf.py
-selfdrive/locationd/kalman/models/car_kf.py
+selfdrive/locationd/models/.gitignore
+selfdrive/locationd/models/SConscript
+selfdrive/locationd/models/live_kf.py
+selfdrive/locationd/models/car_kf.py
+selfdrive/locationd/models/constants.py
 
 selfdrive/locationd/calibrationd.py
 selfdrive/locationd/calibration_helpers.py
@@ -427,3 +424,5 @@ installer/updater/Makefile
 
 scripts/update_now.sh
 scripts/stop_updater.sh
+
+rednose/**
diff --git a/selfdrive/locationd/SConscript b/selfdrive/locationd/SConscript
index 45c926ee..29b5d00d 100644
--- a/selfdrive/locationd/SConscript
+++ b/selfdrive/locationd/SConscript
@@ -19,4 +19,3 @@ env.Program("ubloxd_test", [
   "ublox_msg.cc",
   "ubloxd_main.cc"],
   LIBS=loc_libs)
-
diff --git a/selfdrive/locationd/kalman/README.md b/selfdrive/locationd/kalman/README.md
deleted file mode 100644
index 4c4ebd59..00000000
--- a/selfdrive/locationd/kalman/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Kalman filter library
-
-## Introduction
-The kalman filter framework described here is an incredibly powerful tool for any optimization problem,
-but particularly for visual odometry, sensor fusion localization or SLAM. It is designed to provide very
-accurate results, work online or offline, be fairly computationally efficient, be easy to design filters with in
-python.
-
-## Feature walkthrough
-
-### Extended Kalman Filter with symbolic Jacobian computation
-Most dynamic systems can be described as a Hidden Markov Process. To estimate the state of such a system with noisy
-measurements one can use a Recursive Bayesian estimator. For a linear Markov Process a regular linear Kalman filter is optimal.
-Unfortunately, a lot of systems are non-linear. Extended Kalman Filters can model systems by linearizing the non-linear
-system at every step, this provides a close to optimal estimator when the linearization is good enough. If the linearization
-introduces too much noise, one can use an Iterated Extended Kalman Filter, Unscented Kalman Filter or a Particle Filter. For
-most applications those estimators are overkill and introduce too much complexity and require a lot of additional compute.
-
-Conventionally Extended Kalman Filters are implemented by writing the system's dynamic equations and then manually symbolically 
-calculating the Jacobians for the linearization. For complex systems this is time consuming and very prone to calculation errors.
-This library symbolically computes the Jacobians using sympy to simplify the system's definition and remove the possiblity of introducing calculation errors.
-
-### Error State Kalman Filter
-3D localization algorithms ussually also require estimating orientation of an object in 3D. Orientation is generally represented
-with euler angles or quaternions. 
-
-Euler angles have several problems, there are mulitple ways to represent the same orientation,
-gimbal lock can cause the loss of a degree of freedom and lastly their behaviour is very non-linear when errors are large. 
-Quaternions with one strictly positive dimension don't suffer from these issues, but have another set of problems.
-Quaternions need to be normalized otherwise they will grow unbounded, this is cannot be cleanly enforced in a kalman filter.
-Most importantly though a quaternion has 4 dimensions, but only represents 3 degrees of freedom, so there is one redundant dimension.
-
-Kalman filters are designed to minimize the error of the system's state. It is possible to have a kalman filter where state and the error of the state are represented in a different space. As long as there is an error function that can compute the error based on the true state and estimated state. It is problematic to have redundant dimensions in the error of the kalman filter, but not in the state. A good compromise then, is to use the quaternion to represent the system's attitude state and use euler angles to describe the error in attitude. This library supports and defining an arbitrary error that is in  a different space than the state. [Joan Solà](https://arxiv.org/abs/1711.02508) has written a comprehensive description of using ESKFs for robust 3D orientation estimation.
-
-### Multi-State Constraint Kalman Filter
-How do you integrate feature-based visual odometry with a Kalman filter? The problem is that one cannot write an observation equation for 2D feature observations in image space for a localization kalman filter. One needs to give the feature observation a depth so it has a 3D position, then one can write an obvervation equation in the kalman filter. This is possible by tracking the feature across frames and then estimating the depth. However, the solution is not that simple, the depth estimated by tracking the feature across frames depends on the location of the camera at those frames, and thus the state of the kalman filter. This creates a positive feedback loop where the kalman filter wrongly gains confidence in it's position because the feature position updates reinforce it.
-
-The solution is to use an [MSCKF](http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.437.1085&rep=rep1&type=pdf), which this library fully supports.
-
-### Rauch–Tung–Striebel smoothing
-When doing offline estimation with a kalman filter there can be an initialization period where states are badly estimated. 
-Global estimators don't suffer from this, to make our kalman filter competitive with global optimizers we can run the filter
-backwards using an RTS smoother. Those combined with potentially multiple forward and backwards passes of the data should make
-performance very close to global optimization.
-
-### Mahalanobis distance outlier rejector
-A lot of measurements do not come from a Gaussian distribution and as such have outliers that do not fit the statistical model
-of the Kalman filter. This can cause a lot of performance issues if not dealt with. This library allows the use of a mahalanobis
-distance statistical test on the incoming measurements to deal with this. Note that good initialization is critical to prevent
-good measurements from being rejected.
-
-
diff --git a/selfdrive/locationd/kalman/SConscript b/selfdrive/locationd/kalman/SConscript
deleted file mode 100644
index dcacb97c..00000000
--- a/selfdrive/locationd/kalman/SConscript
+++ /dev/null
@@ -1,37 +0,0 @@
-Import('env', 'arch')
-
-templates = Glob('templates/*')
-sympy_helpers = "helpers/sympy_helpers.py"
-ekf_sym = "helpers/ekf_sym.py"
-
-to_build = {
-    'car': 'models/car_kf.py',
-    'live': 'models/live_kf.py',
-}
-
-
-if arch != "aarch64":
-    to_build.update({
-        'lane': '#xx/pipeline/lib/ekf/lane_kf.py',
-        'pos_computer_4': 'helpers/lst_sq_computer.py',
-        'pos_computer_5': 'helpers/lst_sq_computer.py',
-        'feature_handler_5': 'helpers/feature_handler.py',
-        'loc_4': 'models/loc_kf.py',
-        'gnss': 'models/gnss_kf.py',
-    })
-
-found = {}
-
-for target, command in to_build.items():
-    if File(command).exists():
-        found[target] = command
-
-for target, command in found.items():
-    target_files = File([f'generated/{target}.cpp', f'generated/{target}.h'])
-    command_file = File(command)
-    env.Command(target_files,
-                [templates, command_file, sympy_helpers, ekf_sym],
-                command_file.get_abspath()+" "+target
-    )
-
-    env.SharedLibrary('generated/' + target, target_files[0])
diff --git a/selfdrive/locationd/kalman/helpers/__init__.py b/selfdrive/locationd/kalman/helpers/__init__.py
deleted file mode 100644
index fd07abbe..00000000
--- a/selfdrive/locationd/kalman/helpers/__init__.py
+++ /dev/null
@@ -1,208 +0,0 @@
-import numpy as np
-import os
-from bisect import bisect
-from tqdm import tqdm
-from cffi import FFI
-
-TEMPLATE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'templates'))
-GENERATED_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'generated'))
-
-
-def write_code(name, code, header):
-  if not os.path.exists(GENERATED_DIR):
-    os.mkdir(GENERATED_DIR)
-
-  open(os.path.join(GENERATED_DIR, f"{name}.cpp"), 'w').write(code)
-  open(os.path.join(GENERATED_DIR, f"{name}.h"), 'w').write(header)
-
-
-def load_code(name):
-  shared_fn = os.path.join(GENERATED_DIR, f"lib{name}.so")
-  header_fn = os.path.join(GENERATED_DIR, f"{name}.h")
-  header = open(header_fn).read()
-
-  ffi = FFI()
-  ffi.cdef(header)
-  return (ffi, ffi.dlopen(shared_fn))
-
-
-class KalmanError(Exception):
-  pass
-
-
-class ObservationKind():
-  UNKNOWN = 0
-  NO_OBSERVATION = 1
-  GPS_NED = 2
-  ODOMETRIC_SPEED = 3
-  PHONE_GYRO = 4
-  GPS_VEL = 5
-  PSEUDORANGE_GPS = 6
-  PSEUDORANGE_RATE_GPS = 7
-  SPEED = 8
-  NO_ROT = 9
-  PHONE_ACCEL = 10
-  ORB_POINT = 11
-  ECEF_POS = 12
-  CAMERA_ODO_TRANSLATION = 13
-  CAMERA_ODO_ROTATION = 14
-  ORB_FEATURES = 15
-  MSCKF_TEST = 16
-  FEATURE_TRACK_TEST = 17
-  LANE_PT = 18
-  IMU_FRAME = 19
-  PSEUDORANGE_GLONASS = 20
-  PSEUDORANGE_RATE_GLONASS = 21
-  PSEUDORANGE = 22
-  PSEUDORANGE_RATE = 23
-
-  ROAD_FRAME_XY_SPEED = 24  # (x, y) [m/s]
-  ROAD_FRAME_YAW_RATE = 25  # [rad/s]
-  STEER_ANGLE = 26  # [rad]
-  ANGLE_OFFSET_FAST = 27  # [rad]
-  STIFFNESS = 28  # [-]
-  STEER_RATIO = 29  # [-]
-  ROAD_FRAME_X_SPEED = 30  # (x) [m/s]
-
-  names = [
-    'Unknown',
-    'No observation',
-    'GPS NED',
-    'Odometric speed',
-    'Phone gyro',
-    'GPS velocity',
-    'GPS pseudorange',
-    'GPS pseudorange rate',
-    'Speed',
-    'No rotation',
-    'Phone acceleration',
-    'ORB point',
-    'ECEF pos',
-    'camera odometric translation',
-    'camera odometric rotation',
-    'ORB features',
-    'MSCKF test',
-    'Feature track test',
-    'Lane ecef point',
-    'imu frame eulers',
-    'GLONASS pseudorange',
-    'GLONASS pseudorange rate',
-
-    'Road Frame x,y speed',
-    'Road Frame yaw rate',
-    'Steer Angle',
-    'Fast Angle Offset',
-    'Stiffness',
-    'Steer Ratio',
-  ]
-
-  @classmethod
-  def to_string(cls, kind):
-    return cls.names[kind]
-
-
-
-SAT_OBS = [ObservationKind.PSEUDORANGE_GPS,
-           ObservationKind.PSEUDORANGE_RATE_GPS,
-           ObservationKind.PSEUDORANGE_GLONASS,
-           ObservationKind.PSEUDORANGE_RATE_GLONASS]
-
-
-def run_car_ekf_offline(kf, observations_by_kind):
-  from laika.raw_gnss import GNSSMeasurement
-  observations = []
-  # create list of observations with element format: [kind, time, data]
-  for kind in observations_by_kind:
-    for t, data in zip(observations_by_kind[kind][0], observations_by_kind[kind][1]):
-      observations.append([t, kind, data])
-  observations.sort(key=lambda obs: obs[0])
-
-  times, estimates = run_observations_through_filter(kf, observations)
-
-  forward_states = np.stack(e[1] for e in estimates)
-  forward_covs = np.stack(e[3] for e in estimates)
-  smoothed_states, smoothed_covs = kf.rts_smooth(estimates)
-
-  observations_dict = {}
-  # TODO assuming observations and estimates
-  # are same length may not work with VO
-  for e in estimates:
-    t = e[4]
-    kind = str(int(e[5]))
-    res = e[6]
-    z = e[7]
-    ea = e[8]
-    if len(z) == 0:
-      continue
-    if kind not in observations_dict:
-      observations_dict[kind] = {}
-      observations_dict[kind]['t'] = np.array(len(z)*[t])
-      observations_dict[kind]['z'] = np.array(z)
-      observations_dict[kind]['ea'] = np.array(ea)
-      observations_dict[kind]['residual'] = np.array(res)
-    else:
-      observations_dict[kind]['t'] = np.append(observations_dict[kind]['t'], np.array(len(z)*[t]))
-      observations_dict[kind]['z'] = np.vstack((observations_dict[kind]['z'], np.array(z)))
-      observations_dict[kind]['ea'] = np.vstack((observations_dict[kind]['ea'], np.array(ea)))
-      observations_dict[kind]['residual'] = np.vstack((observations_dict[kind]['residual'], np.array(res)))
-
-  # add svIds to gnss data
-  for kind in map(str, SAT_OBS):
-    if int(kind) in observations_by_kind and kind in observations_dict:
-      observations_dict[kind]['svIds'] = np.array([])
-      observations_dict[kind]['CNO'] = np.array([])
-      observations_dict[kind]['std'] = np.array([])
-      for obs in observations_by_kind[int(kind)][1]:
-        observations_dict[kind]['svIds'] = np.append(observations_dict[kind]['svIds'],
-                                                     np.array([obs[:,GNSSMeasurement.PRN]]))
-        observations_dict[kind]['std'] = np.append(observations_dict[kind]['std'],
-                                                   np.array([obs[:,GNSSMeasurement.PR_STD]]))
-  return smoothed_states, smoothed_covs, forward_states, forward_covs, times, observations_dict
-
-
-def run_observations_through_filter(kf, observations, filter_time=None):
-  estimates = []
-
-  for obs in tqdm(observations):
-    t = obs[0]
-    kind = obs[1]
-    data = obs[2]
-    estimates.append(kf.predict_and_observe(t, kind, data))
-  times = [x[4] for x in estimates]
-  return times, estimates
-
-
-def save_residuals_plot(obs, save_path, data_name):
-  import matplotlib.pyplot as plt
-  import mpld3  # pylint: disable=import-error
-  fig = plt.figure(figsize=(10,20))
-  fig.suptitle('Residuals of ' + data_name, fontsize=24)
-  n = len(list(obs.keys()))
-  start_times = [obs[kind]['t'][0] for kind in obs]
-  start_time = min(start_times)
-  xlims = [start_time + 3, start_time + 60]
-
-  for i, kind in enumerate(obs):
-    ax = fig.add_subplot(n, 1, i+1)
-    ax.set_xlim(xlims)
-    t = obs[kind]['t']
-    res = obs[kind]['residual']
-    start_idx = bisect(t, xlims[0])
-    if len(res) == start_idx:
-      continue
-    ylim = max(np.linalg.norm(res[start_idx:], axis=1))
-    ax.set_ylim([-ylim, ylim])
-    if int(kind) in SAT_OBS:
-      svIds = obs[kind]['svIds']
-      for svId in set(svIds):
-        svId_idx = (svIds == svId)
-        t = obs[kind]['t'][svId_idx]
-        res = obs[kind]['residual'][svId_idx]
-        ax.plot(t, res, label='SV ' + str(int(svId)))
-        ax.legend(loc='right')
-    else:
-      ax.plot(t, res)
-    plt.title('Residual of kind ' + ObservationKind.to_string(int(kind)), fontsize=20)
-  plt.tight_layout()
-  os.makedirs(save_path)
-  mpld3.save_html(fig, save_path + 'residuals_plot.html')
diff --git a/selfdrive/locationd/kalman/helpers/chi2_lookup.py b/selfdrive/locationd/kalman/helpers/chi2_lookup.py
deleted file mode 100644
index e22cc972..00000000
--- a/selfdrive/locationd/kalman/helpers/chi2_lookup.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-
-import numpy as np
-
-
-def gen_chi2_ppf_lookup(max_dim=200):
-  from scipy.stats import chi2
-  table = np.zeros((max_dim, 98))
-  for dim in range(1, max_dim):
-    table[dim] = chi2.ppf(np.arange(.01, .99, .01), dim)
-
-  np.save('chi2_lookup_table', table)
-
-
-def chi2_ppf(p, dim):
-  table = np.load(os.path.dirname(os.path.realpath(__file__)) + '/chi2_lookup_table.npy')
-  result = np.interp(p, np.arange(.01, .99, .01), table[dim])
-  return result
-
-
-if __name__ == "__main__":
-  gen_chi2_ppf_lookup()
diff --git a/selfdrive/locationd/kalman/helpers/chi2_lookup_table.npy b/selfdrive/locationd/kalman/helpers/chi2_lookup_table.npy
deleted file mode 100644
index 6f1bd959..00000000
Binary files a/selfdrive/locationd/kalman/helpers/chi2_lookup_table.npy and /dev/null differ
diff --git a/selfdrive/locationd/kalman/helpers/ekf_sym.py b/selfdrive/locationd/kalman/helpers/ekf_sym.py
deleted file mode 100644
index d18feddf..00000000
--- a/selfdrive/locationd/kalman/helpers/ekf_sym.py
+++ /dev/null
@@ -1,602 +0,0 @@
-import os
-from bisect import bisect_right
-
-import numpy as np
-import sympy as sp
-from numpy import dot
-
-from selfdrive.locationd.kalman.helpers.sympy_helpers import sympy_into_c
-from selfdrive.locationd.kalman.helpers import (TEMPLATE_DIR, load_code,
-                                                write_code)
-
-from selfdrive.locationd.kalman.helpers.chi2_lookup import chi2_ppf
-
-
-def solve(a, b):
-  if a.shape[0] == 1 and a.shape[1] == 1:
-    return b / a[0][0]
-  else:
-    return np.linalg.solve(a, b)
-
-
-def null(H, eps=1e-12):
-  u, s, vh = np.linalg.svd(H)
-  padding = max(0, np.shape(H)[1] - np.shape(s)[0])
-  null_mask = np.concatenate(((s <= eps), np.ones((padding,), dtype=bool)), axis=0)
-  null_space = np.compress(null_mask, vh, axis=0)
-  return np.transpose(null_space)
-
-
-def gen_code(name, f_sym, dt_sym, x_sym, obs_eqs, dim_x, dim_err, eskf_params=None, msckf_params=None, maha_test_kinds=[], global_vars=None):
-  # optional state transition matrix, H modifier
-  # and err_function if an error-state kalman filter (ESKF)
-  # is desired. Best described in "Quaternion kinematics
-  # for the error-state Kalman filter" by Joan Sola
-
-  if eskf_params:
-    err_eqs = eskf_params[0]
-    inv_err_eqs = eskf_params[1]
-    H_mod_sym = eskf_params[2]
-    f_err_sym = eskf_params[3]
-    x_err_sym = eskf_params[4]
-  else:
-    nom_x = sp.MatrixSymbol('nom_x', dim_x, 1)
-    true_x = sp.MatrixSymbol('true_x', dim_x, 1)
-    delta_x = sp.MatrixSymbol('delta_x', dim_x, 1)
-    err_function_sym = sp.Matrix(nom_x + delta_x)
-    inv_err_function_sym = sp.Matrix(true_x - nom_x)
-    err_eqs = [err_function_sym, nom_x, delta_x]
-    inv_err_eqs = [inv_err_function_sym, nom_x, true_x]
-
-    H_mod_sym = sp.Matrix(np.eye(dim_x))
-    f_err_sym = f_sym
-    x_err_sym = x_sym
-
-  # This configures the multi-state augmentation
-  # needed for EKF-SLAM with MSCKF (Mourikis et al 2007)
-  if msckf_params:
-    msckf = True
-    dim_main = msckf_params[0]      # size of the main state
-    dim_augment = msckf_params[1]   # size of one augment state chunk
-    dim_main_err = msckf_params[2]
-    dim_augment_err = msckf_params[3]
-    N = msckf_params[4]
-    feature_track_kinds = msckf_params[5]
-    assert dim_main + dim_augment * N == dim_x
-    assert dim_main_err + dim_augment_err * N == dim_err
-  else:
-    msckf = False
-    dim_main = dim_x
-    dim_augment = 0
-    dim_main_err = dim_err
-    dim_augment_err = 0
-    N = 0
-
-  # linearize with jacobians
-  F_sym = f_err_sym.jacobian(x_err_sym)
-
-  if eskf_params:
-    for sym in x_err_sym:
-      F_sym = F_sym.subs(sym, 0)
-
-  assert dt_sym in F_sym.free_symbols
-
-  for i in range(len(obs_eqs)):
-    obs_eqs[i].append(obs_eqs[i][0].jacobian(x_sym))
-    if msckf and obs_eqs[i][1] in feature_track_kinds:
-      obs_eqs[i].append(obs_eqs[i][0].jacobian(obs_eqs[i][2]))
-    else:
-      obs_eqs[i].append(None)
-
-  # collect sympy functions
-  sympy_functions = []
-
-  # error functions
-  sympy_functions.append(('err_fun', err_eqs[0], [err_eqs[1], err_eqs[2]]))
-  sympy_functions.append(('inv_err_fun', inv_err_eqs[0], [inv_err_eqs[1], inv_err_eqs[2]]))
-
-  # H modifier for ESKF updates
-  sympy_functions.append(('H_mod_fun', H_mod_sym, [x_sym]))
-
-  # state propagation function
-  sympy_functions.append(('f_fun', f_sym, [x_sym, dt_sym]))
-  sympy_functions.append(('F_fun', F_sym, [x_sym, dt_sym]))
-
-  # observation functions
-  for h_sym, kind, ea_sym, H_sym, He_sym in obs_eqs:
-    sympy_functions.append(('h_%d' % kind, h_sym, [x_sym, ea_sym]))
-    sympy_functions.append(('H_%d' % kind, H_sym, [x_sym, ea_sym]))
-    if msckf and kind in feature_track_kinds:
-      sympy_functions.append(('He_%d' % kind, He_sym, [x_sym, ea_sym]))
-
-  # Generate and wrap all th c code
-  header, code = sympy_into_c(sympy_functions, global_vars)
-  extra_header = "#define DIM %d\n" % dim_x
-  extra_header += "#define EDIM %d\n" % dim_err
-  extra_header += "#define MEDIM %d\n" % dim_main_err
-  extra_header += "typedef void (*Hfun)(double *, double *, double *);\n"
-
-  extra_header += "\nvoid predict(double *x, double *P, double *Q, double dt);"
-
-  extra_post = ""
-
-  for h_sym, kind, ea_sym, H_sym, He_sym in obs_eqs:
-    if msckf and kind in feature_track_kinds:
-      He_str = 'He_%d' % kind
-      # ea_dim = ea_sym.shape[0]
-    else:
-      He_str = 'NULL'
-      # ea_dim = 1 # not really dim of ea but makes c function work
-    maha_thresh = chi2_ppf(0.95, int(h_sym.shape[0]))  # mahalanobis distance for outlier detection
-    maha_test = kind in maha_test_kinds
-    extra_post += """
-      void update_%d(double *in_x, double *in_P, double *in_z, double *in_R, double *in_ea) {
-        update<%d,%d,%d>(in_x, in_P, h_%d, H_%d, %s, in_z, in_R, in_ea, MAHA_THRESH_%d);
-      }
-    """ % (kind, h_sym.shape[0], 3, maha_test, kind, kind, He_str, kind)
-    extra_header += "\nconst static double MAHA_THRESH_%d = %f;" % (kind, maha_thresh)
-    extra_header += "\nvoid update_%d(double *, double *, double *, double *, double *);" % kind
-
-  code += '\nextern "C"{\n' + extra_header + "\n}\n"
-  code += "\n" + open(os.path.join(TEMPLATE_DIR, "ekf_c.c")).read()
-  code += '\nextern "C"{\n' + extra_post + "\n}\n"
-
-  if global_vars is not None:
-    global_code = '\nextern "C"{\n'
-    for var in global_vars:
-      global_code += f"\ndouble {var.name};\n"
-      global_code += f"\nvoid set_{var.name}(double x){{ {var.name} = x;}}\n"
-      extra_header += f"\nvoid set_{var.name}(double x);\n"
-
-    global_code += '\n}\n'
-    code = global_code + code
-
-  header += "\n" + extra_header
-
-  write_code(name, code, header)
-
-
-class EKF_sym():
-  def __init__(self, name, Q, x_initial, P_initial, dim_main, dim_main_err,
-               N=0, dim_augment=0, dim_augment_err=0, maha_test_kinds=[], global_vars=None):
-    """Generates process function and all observation functions for the kalman filter."""
-    self.msckf = N > 0
-    self.N = N
-    self.dim_augment = dim_augment
-    self.dim_augment_err = dim_augment_err
-    self.dim_main = dim_main
-    self.dim_main_err = dim_main_err
-
-    # state
-    x_initial = x_initial.reshape((-1, 1))
-    self.dim_x = x_initial.shape[0]
-    self.dim_err = P_initial.shape[0]
-    assert dim_main + dim_augment * N == self.dim_x
-    assert dim_main_err + dim_augment_err * N == self.dim_err
-    assert Q.shape == P_initial.shape
-
-    # kinds that should get mahalanobis distance
-    # tested for outlier rejection
-    self.maha_test_kinds = maha_test_kinds
-
-    self.global_vars = global_vars
-
-    # process noise
-    self.Q = Q
-
-    # rewind stuff
-    self.rewind_t = []
-    self.rewind_states = []
-    self.rewind_obscache = []
-    self.init_state(x_initial, P_initial, None)
-
-    ffi, lib = load_code(name)
-    kinds, self.feature_track_kinds = [], []
-    for func in dir(lib):
-      if func[:2] == 'h_':
-        kinds.append(int(func[2:]))
-      if func[:3] == 'He_':
-        self.feature_track_kinds.append(int(func[3:]))
-
-    # wrap all the sympy functions
-    def wrap_1lists(name):
-      func = eval("lib.%s" % name, {"lib": lib})
-
-      def ret(lst1, out):
-        func(ffi.cast("double *", lst1.ctypes.data),
-             ffi.cast("double *", out.ctypes.data))
-      return ret
-
-    def wrap_2lists(name):
-      func = eval("lib.%s" % name, {"lib": lib})
-
-      def ret(lst1, lst2, out):
-        func(ffi.cast("double *", lst1.ctypes.data),
-             ffi.cast("double *", lst2.ctypes.data),
-             ffi.cast("double *", out.ctypes.data))
-      return ret
-
-    def wrap_1list_1float(name):
-      func = eval("lib.%s" % name, {"lib": lib})
-
-      def ret(lst1, fl, out):
-        func(ffi.cast("double *", lst1.ctypes.data),
-             ffi.cast("double", fl),
-             ffi.cast("double *", out.ctypes.data))
-      return ret
-
-    self.f = wrap_1list_1float("f_fun")
-    self.F = wrap_1list_1float("F_fun")
-
-    self.err_function = wrap_2lists("err_fun")
-    self.inv_err_function = wrap_2lists("inv_err_fun")
-    self.H_mod = wrap_1lists("H_mod_fun")
-
-    self.hs, self.Hs, self.Hes = {}, {}, {}
-    for kind in kinds:
-      self.hs[kind] = wrap_2lists("h_%d" % kind)
-      self.Hs[kind] = wrap_2lists("H_%d" % kind)
-      if self.msckf and kind in self.feature_track_kinds:
-        self.Hes[kind] = wrap_2lists("He_%d" % kind)
-
-    if self.global_vars is not None:
-      for var in self.global_vars:
-        fun_name = f"set_{var.name}"
-        setattr(self, fun_name, getattr(lib, fun_name))
-
-    # wrap the C++ predict function
-    def _predict_blas(x, P, dt):
-      lib.predict(ffi.cast("double *", x.ctypes.data),
-                  ffi.cast("double *", P.ctypes.data),
-                  ffi.cast("double *", self.Q.ctypes.data),
-                  ffi.cast("double", dt))
-      return x, P
-
-    # wrap the C++ update function
-    def fun_wrapper(f, kind):
-      f = eval("lib.%s" % f, {"lib": lib})
-
-      def _update_inner_blas(x, P, z, R, extra_args):
-        f(ffi.cast("double *", x.ctypes.data),
-          ffi.cast("double *", P.ctypes.data),
-          ffi.cast("double *", z.ctypes.data),
-          ffi.cast("double *", R.ctypes.data),
-          ffi.cast("double *", extra_args.ctypes.data))
-        if self.msckf and kind in self.feature_track_kinds:
-          y = z[:-len(extra_args)]
-        else:
-          y = z
-        return x, P, y
-      return _update_inner_blas
-
-    self._updates = {}
-    for kind in kinds:
-      self._updates[kind] = fun_wrapper("update_%d" % kind, kind)
-
-    def _update_blas(x, P, kind, z, R, extra_args=[]):
-        return self._updates[kind](x, P, z, R, extra_args)
-
-    # assign the functions
-    self._predict = _predict_blas
-    # self._predict = self._predict_python
-    self._update = _update_blas
-    # self._update = self._update_python
-
-  def init_state(self, state, covs, filter_time):
-    self.x = np.array(state.reshape((-1, 1))).astype(np.float64)
-    self.P = np.array(covs).astype(np.float64)
-    self.filter_time = filter_time
-    self.augment_times = [0] * self.N
-    self.rewind_obscache = []
-    self.rewind_t = []
-    self.rewind_states = []
-
-  def reset_rewind(self):
-    self.rewind_obscache = []
-    self.rewind_t = []
-    self.rewind_states = []
-
-  def augment(self):
-    # TODO this is not a generalized way of doing this and implies that the augmented states
-    # are simply the first (dim_augment_state) elements of the main state.
-    assert self.msckf
-    d1 = self.dim_main
-    d2 = self.dim_main_err
-    d3 = self.dim_augment
-    d4 = self.dim_augment_err
-
-    # push through augmented states
-    self.x[d1:-d3] = self.x[d1 + d3:]
-    self.x[-d3:] = self.x[:d3]
-    assert self.x.shape == (self.dim_x, 1)
-
-    # push through augmented covs
-    assert self.P.shape == (self.dim_err, self.dim_err)
-    P_reduced = self.P
-    P_reduced = np.delete(P_reduced, np.s_[d2:d2 + d4], axis=1)
-    P_reduced = np.delete(P_reduced, np.s_[d2:d2 + d4], axis=0)
-    assert P_reduced.shape == (self.dim_err - d4, self.dim_err - d4)
-    to_mult = np.zeros((self.dim_err, self.dim_err - d4))
-    to_mult[:-d4, :] = np.eye(self.dim_err - d4)
-    to_mult[-d4:, :d4] = np.eye(d4)
-    self.P = to_mult.dot(P_reduced.dot(to_mult.T))
-    self.augment_times = self.augment_times[1:]
-    self.augment_times.append(self.filter_time)
-    assert self.P.shape == (self.dim_err, self.dim_err)
-
-  def state(self):
-    return np.array(self.x).flatten()
-
-  def covs(self):
-    return self.P
-
-  def rewind(self, t):
-    # find where we are rewinding to
-    idx = bisect_right(self.rewind_t, t)
-    assert self.rewind_t[idx - 1] <= t
-    assert self.rewind_t[idx] > t    # must be true, or rewind wouldn't be called
-
-    # set the state to the time right before that
-    self.filter_time = self.rewind_t[idx - 1]
-    self.x[:] = self.rewind_states[idx - 1][0]
-    self.P[:] = self.rewind_states[idx - 1][1]
-
-    # return the observations we rewound over for fast forwarding
-    ret = self.rewind_obscache[idx:]
-
-    # throw away the old future
-    # TODO: is this making a copy?
-    self.rewind_t = self.rewind_t[:idx]
-    self.rewind_states = self.rewind_states[:idx]
-    self.rewind_obscache = self.rewind_obscache[:idx]
-
-    return ret
-
-  def checkpoint(self, obs):
-    # push to rewinder
-    self.rewind_t.append(self.filter_time)
-    self.rewind_states.append((np.copy(self.x), np.copy(self.P)))
-    self.rewind_obscache.append(obs)
-
-    # only keep a certain number around
-    REWIND_TO_KEEP = 512
-    self.rewind_t = self.rewind_t[-REWIND_TO_KEEP:]
-    self.rewind_states = self.rewind_states[-REWIND_TO_KEEP:]
-    self.rewind_obscache = self.rewind_obscache[-REWIND_TO_KEEP:]
-
-  def predict(self, t):
-    # initialize time
-    if self.filter_time is None:
-      self.filter_time = t
-
-    # predict
-    dt = t - self.filter_time
-    assert dt >= 0
-    self.x, self.P = self._predict(self.x, self.P, dt)
-    self.filter_time = t
-
-  def predict_and_update_batch(self, t, kind, z, R, extra_args=[[]], augment=False):
-    # TODO handle rewinding at this level"
-
-    # rewind
-    if self.filter_time is not None and t < self.filter_time:
-      if len(self.rewind_t) == 0 or t < self.rewind_t[0] or t < self.rewind_t[-1] - 1.0:
-        print("observation too old at %.3f with filter at %.3f, ignoring" % (t, self.filter_time))
-        return None
-      rewound = self.rewind(t)
-    else:
-      rewound = []
-
-    ret = self._predict_and_update_batch(t, kind, z, R, extra_args, augment)
-
-    # optional fast forward
-    for r in rewound:
-      self._predict_and_update_batch(*r)
-
-    return ret
-
-  def _predict_and_update_batch(self, t, kind, z, R, extra_args, augment=False):
-    """The main kalman filter function
-    Predicts the state and then updates a batch of observations
-
-    dim_x: dimensionality of the state space
-    dim_z: dimensionality of the observation and depends on kind
-    n: number of observations
-
-    Args:
-      t                 (float): Time of observation
-      kind                (int): Type of observation
-      z         (vec [n,dim_z]): Measurements
-      R  (mat [n,dim_z, dim_z]): Measurement Noise
-      extra_args    (list, [n]): Values used in H computations
-    """
-    # initialize time
-    if self.filter_time is None:
-      self.filter_time = t
-
-    # predict
-    dt = t - self.filter_time
-    assert dt >= 0
-    self.x, self.P = self._predict(self.x, self.P, dt)
-    self.filter_time = t
-    xk_km1, Pk_km1 = np.copy(self.x).flatten(), np.copy(self.P)
-
-    # update batch
-    y = []
-    for i in range(len(z)):
-      # these are from the user, so we canonicalize them
-      z_i = np.array(z[i], dtype=np.float64, order='F')
-      R_i = np.array(R[i], dtype=np.float64, order='F')
-      extra_args_i = np.array(extra_args[i], dtype=np.float64, order='F')
-      # update
-      self.x, self.P, y_i = self._update(self.x, self.P, kind, z_i, R_i, extra_args=extra_args_i)
-      y.append(y_i)
-    xk_k, Pk_k = np.copy(self.x).flatten(), np.copy(self.P)
-
-    if augment:
-      self.augment()
-
-    # checkpoint
-    self.checkpoint((t, kind, z, R, extra_args))
-
-    return xk_km1, xk_k, Pk_km1, Pk_k, t, kind, y, z, extra_args
-
-  def _predict_python(self, x, P, dt):
-    x_new = np.zeros(x.shape, dtype=np.float64)
-    self.f(x, dt, x_new)
-
-    F = np.zeros(P.shape, dtype=np.float64)
-    self.F(x, dt, F)
-
-    if not self.msckf:
-      P = dot(dot(F, P), F.T)
-    else:
-      # Update the predicted state covariance:
-      #  Pk+1|k   =  |F*Pii*FT + Q*dt   F*Pij |
-      #              |PijT*FT           Pjj   |
-      # Where F is the jacobian of the main state
-      # predict function, Pii is the main state's
-      # covariance and Q its process noise. Pij
-      # is the covariance between the augmented
-      # states and the main state.
-      #
-      d2 = self.dim_main_err    # known at compile time
-      F_curr = F[:d2, :d2]
-      P[:d2, :d2] = (F_curr.dot(P[:d2, :d2])).dot(F_curr.T)
-      P[:d2, d2:] = F_curr.dot(P[:d2, d2:])
-      P[d2:, :d2] = P[d2:, :d2].dot(F_curr.T)
-
-    P += dt * self.Q
-    return x_new, P
-
-  def _update_python(self, x, P, kind, z, R, extra_args=[]):
-    # init vars
-    z = z.reshape((-1, 1))
-    h = np.zeros(z.shape, dtype=np.float64)
-    H = np.zeros((z.shape[0], self.dim_x), dtype=np.float64)
-
-    # C functions
-    self.hs[kind](x, extra_args, h)
-    self.Hs[kind](x, extra_args, H)
-
-    # y is the "loss"
-    y = z - h
-
-    # *** same above this line ***
-
-    if self.msckf and kind in self.Hes:
-      # Do some algebraic magic to decorrelate
-      He = np.zeros((z.shape[0], len(extra_args)), dtype=np.float64)
-      self.Hes[kind](x, extra_args, He)
-
-      # TODO: Don't call a function here, do projection locally
-      A = null(He.T)
-
-      y = A.T.dot(y)
-      H = A.T.dot(H)
-      R = A.T.dot(R.dot(A))
-
-      # TODO If nullspace isn't the dimension we want
-      if A.shape[1] + He.shape[1] != A.shape[0]:
-        print('Warning: null space projection failed, measurement ignored')
-        return x, P, np.zeros(A.shape[0] - He.shape[1])
-
-    # if using eskf
-    H_mod = np.zeros((x.shape[0], P.shape[0]), dtype=np.float64)
-    self.H_mod(x, H_mod)
-    H = H.dot(H_mod)
-
-    # Do mahalobis distance test
-    # currently just runs on msckf observations
-    # could run on anything if needed
-    if self.msckf and kind in self.maha_test_kinds:
-      a = np.linalg.inv(H.dot(P).dot(H.T) + R)
-      maha_dist = y.T.dot(a.dot(y))
-      if maha_dist > chi2_ppf(0.95, y.shape[0]):
-        R = 10e16 * R
-
-    # *** same below this line ***
-
-    # Outlier resilient weighting as described in:
-    # "A Kalman Filter for Robust Outlier Detection - Jo-Anne Ting, ..."
-    weight = 1  # (1.5)/(1 + np.sum(y**2)/np.sum(R))
-
-    S = dot(dot(H, P), H.T) + R / weight
-    K = solve(S, dot(H, P.T)).T
-    I_KH = np.eye(P.shape[0]) - dot(K, H)
-
-    # update actual state
-    delta_x = dot(K, y)
-    P = dot(dot(I_KH, P), I_KH.T) + dot(dot(K, R), K.T)
-
-    # inject observed error into state
-    x_new = np.zeros(x.shape, dtype=np.float64)
-    self.err_function(x, delta_x, x_new)
-    return x_new, P, y.flatten()
-
-  def maha_test(self, x, P, kind, z, R, extra_args=[], maha_thresh=0.95):
-    # init vars
-    z = z.reshape((-1, 1))
-    h = np.zeros(z.shape, dtype=np.float64)
-    H = np.zeros((z.shape[0], self.dim_x), dtype=np.float64)
-
-    # C functions
-    self.hs[kind](x, extra_args, h)
-    self.Hs[kind](x, extra_args, H)
-
-    # y is the "loss"
-    y = z - h
-
-    # if using eskf
-    H_mod = np.zeros((x.shape[0], P.shape[0]), dtype=np.float64)
-    self.H_mod(x, H_mod)
-    H = H.dot(H_mod)
-
-    a = np.linalg.inv(H.dot(P).dot(H.T) + R)
-    maha_dist = y.T.dot(a.dot(y))
-    if maha_dist > chi2_ppf(maha_thresh, y.shape[0]):
-      return False
-    else:
-      return True
-
-  def rts_smooth(self, estimates, norm_quats=False):
-    '''
-    Returns rts smoothed results of
-    kalman filter estimates
-
-    If the kalman state is augmented with
-    old states only the main state is smoothed
-    '''
-    xk_n = estimates[-1][0]
-    Pk_n = estimates[-1][2]
-    Fk_1 = np.zeros(Pk_n.shape, dtype=np.float64)
-
-    states_smoothed = [xk_n]
-    covs_smoothed = [Pk_n]
-    for k in range(len(estimates) - 2, -1, -1):
-      xk1_n = xk_n
-      if norm_quats:
-        xk1_n[3:7] /= np.linalg.norm(xk1_n[3:7])
-      Pk1_n = Pk_n
-
-      xk1_k, _, Pk1_k, _, t2, _, _, _, _ = estimates[k + 1]
-      _, xk_k, _, Pk_k, t1, _, _, _, _ = estimates[k]
-      dt = t2 - t1
-      self.F(xk_k, dt, Fk_1)
-
-      d1 = self.dim_main
-      d2 = self.dim_main_err
-      Ck = np.linalg.solve(Pk1_k[:d2, :d2], Fk_1[:d2, :d2].dot(Pk_k[:d2, :d2].T)).T
-      xk_n = xk_k
-      delta_x = np.zeros((Pk_n.shape[0], 1), dtype=np.float64)
-      self.inv_err_function(xk1_k, xk1_n, delta_x)
-      delta_x[:d2] = Ck.dot(delta_x[:d2])
-      x_new = np.zeros((xk_n.shape[0], 1), dtype=np.float64)
-      self.err_function(xk_k, delta_x, x_new)
-      xk_n[:d1] = x_new[:d1, 0]
-      Pk_n = Pk_k
-      Pk_n[:d2, :d2] = Pk_k[:d2, :d2] + Ck.dot(Pk1_n[:d2, :d2] - Pk1_k[:d2, :d2]).dot(Ck.T)
-      states_smoothed.append(xk_n)
-      covs_smoothed.append(Pk_n)
-
-    return np.flipud(np.vstack(states_smoothed)), np.stack(covs_smoothed, 0)[::-1]
diff --git a/selfdrive/locationd/kalman/helpers/feature_handler.py b/selfdrive/locationd/kalman/helpers/feature_handler.py
deleted file mode 100755
index 74eb531f..00000000
--- a/selfdrive/locationd/kalman/helpers/feature_handler.py
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-
-import numpy as np
-
-import common.transformations.orientation as orient
-from selfdrive.locationd.kalman.helpers import (TEMPLATE_DIR, load_code,
-                                                write_code)
-from selfdrive.locationd.kalman.helpers.sympy_helpers import quat_matrix_l
-
-
-def sane(track):
-  img_pos = track[1:, 2:4]
-  diffs_x = abs(img_pos[1:, 0] - img_pos[:-1, 0])
-  diffs_y = abs(img_pos[1:, 1] - img_pos[:-1, 1])
-  for i in range(1, len(diffs_x)):
-    if ((diffs_x[i] > 0.05 or diffs_x[i - 1] > 0.05) and
-        (diffs_x[i] > 2 * diffs_x[i - 1] or
-         diffs_x[i] < .5 * diffs_x[i - 1])) or \
-       ((diffs_y[i] > 0.05 or diffs_y[i - 1] > 0.05) and
-        (diffs_y[i] > 2 * diffs_y[i - 1] or
-         diffs_y[i] < .5 * diffs_y[i - 1])):
-      return False
-  return True
-
-
-class FeatureHandler():
-  name = 'feature_handler'
-
-  @staticmethod
-  def generate_code(K=5):
-    # Wrap c code for slow matching
-    c_header = "\nvoid merge_features(double *tracks, double *features, long long *empty_idxs);"
-
-    c_code = "#include <math.h>\n"
-    c_code += "#include <string.h>\n"
-    c_code += "#define K %d\n" % K
-    c_code += "\n" + open(os.path.join(TEMPLATE_DIR, "feature_handler.c")).read()
-
-    filename = f"{FeatureHandler.name}_{K}"
-    write_code(filename, c_code, c_header)
-
-  def __init__(self, K=5):
-    self.MAX_TRACKS = 6000
-    self.K = K
-
-    # Array of tracks, each track has K 5D features preceded
-    # by 5 params that inidicate [f_idx, last_idx, updated, complete, valid]
-    # f_idx: idx of current last feature in track
-    # idx of of last feature in frame
-    # bool for whether this track has been update
-    # bool for whether this track is complete
-    # bool for whether this track is valid
-    self.tracks = np.zeros((self.MAX_TRACKS, K + 1, 5))
-    self.tracks[:] = np.nan
-
-    name = f"{FeatureHandler.name}_{K}"
-    ffi, lib = load_code(name)
-
-    def merge_features_c(tracks, features, empty_idxs):
-      lib.merge_features(ffi.cast("double *", tracks.ctypes.data),
-                         ffi.cast("double *", features.ctypes.data),
-                         ffi.cast("long long *", empty_idxs.ctypes.data))
-
-    # self.merge_features = self.merge_features_python
-    self.merge_features = merge_features_c
-
-  def reset(self):
-    self.tracks[:] = np.nan
-
-  def merge_features_python(self, tracks, features, empty_idxs):
-    empty_idx = 0
-    for f in features:
-      match_idx = int(f[4])
-      if tracks[match_idx, 0, 1] == match_idx and tracks[match_idx, 0, 2] == 0:
-        tracks[match_idx, 0, 0] += 1
-        tracks[match_idx, 0, 1] = f[1]
-        tracks[match_idx, 0, 2] = 1
-        tracks[match_idx, int(tracks[match_idx, 0, 0])] = f
-        if tracks[match_idx, 0, 0] == self.K:
-          tracks[match_idx, 0, 3] = 1
-          if sane(tracks[match_idx]):
-            tracks[match_idx, 0, 4] = 1
-      else:
-        if empty_idx == len(empty_idxs):
-          print('need more empty space')
-          continue
-        tracks[empty_idxs[empty_idx], 0, 0] = 1
-        tracks[empty_idxs[empty_idx], 0, 1] = f[1]
-        tracks[empty_idxs[empty_idx], 0, 2] = 1
-        tracks[empty_idxs[empty_idx], 1] = f
-        empty_idx += 1
-
-  def update_tracks(self, features):
-    last_idxs = np.copy(self.tracks[:, 0, 1])
-    real = np.isfinite(last_idxs)
-    self.tracks[last_idxs[real].astype(int)] = self.tracks[real]
-
-    mask = np.ones(self.MAX_TRACKS, np.bool)
-    mask[last_idxs[real].astype(int)] = 0
-    empty_idxs = np.arange(self.MAX_TRACKS)[mask]
-
-    self.tracks[empty_idxs] = np.nan
-    self.tracks[:, 0, 2] = 0
-    self.merge_features(self.tracks, features, empty_idxs)
-
-  def handle_features(self, features):
-    self.update_tracks(features)
-    valid_idxs = self.tracks[:, 0, 4] == 1
-    complete_idxs = self.tracks[:, 0, 3] == 1
-    stale_idxs = self.tracks[:, 0, 2] == 0
-    valid_tracks = self.tracks[valid_idxs]
-    self.tracks[complete_idxs] = np.nan
-    self.tracks[stale_idxs] = np.nan
-    return valid_tracks[:, 1:, :4].reshape((len(valid_tracks), self.K * 4))
-
-
-def generate_orient_error_jac(K):
-  import sympy as sp
-  from selfdrive.locationd.kalman.helpers.sympy_helpers import quat_rotate
-
-  x_sym = sp.MatrixSymbol('abr', 3, 1)
-  dtheta = sp.MatrixSymbol('dtheta', 3, 1)
-  delta_quat = sp.Matrix(np.ones(4))
-  delta_quat[1:, :] = sp.Matrix(0.5 * dtheta[0:3, :])
-  poses_sym = sp.MatrixSymbol('poses', 7 * K, 1)
-  img_pos_sym = sp.MatrixSymbol('img_positions', 2 * K, 1)
-  alpha, beta, rho = x_sym
-  to_c = sp.Matrix(orient.rot_matrix(-np.pi / 2, -np.pi / 2, 0))
-  pos_0 = sp.Matrix(np.array(poses_sym[K * 7 - 7:K * 7 - 4])[:, 0])
-  q = quat_matrix_l(poses_sym[K * 7 - 4:K * 7]) * delta_quat
-  quat_rot = quat_rotate(*q)
-  rot_g_to_0 = to_c * quat_rot.T
-  rows = []
-  for i in range(K):
-    pos_i = sp.Matrix(np.array(poses_sym[i * 7:i * 7 + 3])[:, 0])
-    q = quat_matrix_l(poses_sym[7 * i + 3:7 * i + 7]) * delta_quat
-    quat_rot = quat_rotate(*q)
-    rot_g_to_i = to_c * quat_rot.T
-    rot_0_to_i = rot_g_to_i * (rot_g_to_0.T)
-    trans_0_to_i = rot_g_to_i * (pos_0 - pos_i)
-    funct_vec = rot_0_to_i * sp.Matrix([alpha, beta, 1]) + rho * trans_0_to_i
-    h1, h2, h3 = funct_vec
-    rows.append(h1 / h3 - img_pos_sym[i * 2 + 0])
-    rows.append(h2 / h3 - img_pos_sym[i * 2 + 1])
-  img_pos_residual_sym = sp.Matrix(rows)
-
-  # sympy into c
-  sympy_functions = []
-  sympy_functions.append(('orient_error_jac', img_pos_residual_sym.jacobian(dtheta), [x_sym, poses_sym, img_pos_sym, dtheta]))
-
-  return sympy_functions
-
-
-if __name__ == "__main__":
-  # TODO: get K from argparse
-  FeatureHandler.generate_code()
diff --git a/selfdrive/locationd/kalman/helpers/lst_sq_computer.py b/selfdrive/locationd/kalman/helpers/lst_sq_computer.py
deleted file mode 100755
index 669c76f4..00000000
--- a/selfdrive/locationd/kalman/helpers/lst_sq_computer.py
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env python3
-import os
-import sys
-
-import numpy as np
-import sympy as sp
-
-import common.transformations.orientation as orient
-from selfdrive.locationd.kalman.helpers import (TEMPLATE_DIR, load_code,
-                                                write_code)
-from selfdrive.locationd.kalman.helpers.sympy_helpers import (quat_rotate,
-                                                              sympy_into_c)
-
-
-def generate_residual(K):
-  x_sym = sp.MatrixSymbol('abr', 3, 1)
-  poses_sym = sp.MatrixSymbol('poses', 7 * K, 1)
-  img_pos_sym = sp.MatrixSymbol('img_positions', 2 * K, 1)
-  alpha, beta, rho = x_sym
-  to_c = sp.Matrix(orient.rot_matrix(-np.pi / 2, -np.pi / 2, 0))
-  pos_0 = sp.Matrix(np.array(poses_sym[K * 7 - 7:K * 7 - 4])[:, 0])
-  q = poses_sym[K * 7 - 4:K * 7]
-  quat_rot = quat_rotate(*q)
-  rot_g_to_0 = to_c * quat_rot.T
-  rows = []
-
-  for i in range(K):
-    pos_i = sp.Matrix(np.array(poses_sym[i * 7:i * 7 + 3])[:, 0])
-    q = poses_sym[7 * i + 3:7 * i + 7]
-    quat_rot = quat_rotate(*q)
-    rot_g_to_i = to_c * quat_rot.T
-    rot_0_to_i = rot_g_to_i * rot_g_to_0.T
-    trans_0_to_i = rot_g_to_i * (pos_0 - pos_i)
-    funct_vec = rot_0_to_i * sp.Matrix([alpha, beta, 1]) + rho * trans_0_to_i
-    h1, h2, h3 = funct_vec
-    rows.append(h1 / h3 - img_pos_sym[i * 2 + 0])
-    rows.append(h2 / h3 - img_pos_sym[i * 2 + 1])
-  img_pos_residual_sym = sp.Matrix(rows)
-
-  # sympy into c
-  sympy_functions = []
-  sympy_functions.append(('res_fun', img_pos_residual_sym, [x_sym, poses_sym, img_pos_sym]))
-  sympy_functions.append(('jac_fun', img_pos_residual_sym.jacobian(x_sym), [x_sym, poses_sym, img_pos_sym]))
-
-  return sympy_functions
-
-
-class LstSqComputer():
-  name = 'pos_computer'
-
-  @staticmethod
-  def generate_code(K=4):
-    sympy_functions = generate_residual(K)
-    header, code = sympy_into_c(sympy_functions)
-
-    code += "\n#define KDIM %d\n" % K
-    code += "\n" + open(os.path.join(TEMPLATE_DIR, "compute_pos.c")).read()
-
-    header += """
-    void compute_pos(double *to_c, double *in_poses, double *in_img_positions, double *param, double *pos);
-    """
-
-    filename = f"{LstSqComputer.name}_{K}"
-    write_code(filename, code, header)
-
-  def __init__(self, K=4, MIN_DEPTH=2, MAX_DEPTH=500):
-    self.to_c = orient.rot_matrix(-np.pi / 2, -np.pi / 2, 0)
-    self.MAX_DEPTH = MAX_DEPTH
-    self.MIN_DEPTH = MIN_DEPTH
-
-    name = f"{LstSqComputer.name}_{K}"
-    ffi, lib = load_code(name)
-
-    # wrap c functions
-    def residual_jac(x, poses, img_positions):
-      out = np.zeros(((K * 2, 3)), dtype=np.float64)
-      lib.jac_fun(ffi.cast("double *", x.ctypes.data),
-                  ffi.cast("double *", poses.ctypes.data),
-                  ffi.cast("double *", img_positions.ctypes.data),
-                  ffi.cast("double *", out.ctypes.data))
-      return out
-    self.residual_jac = residual_jac
-
-    def residual(x, poses, img_positions):
-      out = np.zeros((K * 2), dtype=np.float64)
-      lib.res_fun(ffi.cast("double *", x.ctypes.data),
-                  ffi.cast("double *", poses.ctypes.data),
-                  ffi.cast("double *", img_positions.ctypes.data),
-                  ffi.cast("double *", out.ctypes.data))
-      return out
-    self.residual = residual
-
-    def compute_pos_c(poses, img_positions):
-      pos = np.zeros(3, dtype=np.float64)
-      param = np.zeros(3, dtype=np.float64)
-      # Can't be a view for the ctype
-      img_positions = np.copy(img_positions)
-      lib.compute_pos(ffi.cast("double *", self.to_c.ctypes.data),
-                      ffi.cast("double *", poses.ctypes.data),
-                      ffi.cast("double *", img_positions.ctypes.data),
-                      ffi.cast("double *", param.ctypes.data),
-                      ffi.cast("double *", pos.ctypes.data))
-      return pos, param
-    self.compute_pos_c = compute_pos_c
-
-  def compute_pos(self, poses, img_positions, debug=False):
-    pos, param = self.compute_pos_c(poses, img_positions)
-    # pos, param = self.compute_pos_python(poses, img_positions)
-
-    depth = 1 / param[2]
-    if debug:
-      # orient_err_jac = self.orient_error_jac(param, poses, img_positions, np.zeros(3)).reshape((-1,2,3))
-      jac = self.residual_jac(param, poses, img_positions).reshape((-1, 2, 3))
-      res = self.residual(param, poses, img_positions).reshape((-1, 2))
-      return pos, param, res, jac  # , orient_err_jac
-    elif (self.MIN_DEPTH < depth < self.MAX_DEPTH):
-      return pos
-    else:
-      return None
-
-  def gauss_newton(self, fun, jac, x, args):
-    poses, img_positions = args
-    delta = 1
-    counter = 0
-    while abs(np.linalg.norm(delta)) > 1e-4 and counter < 30:
-      delta = np.linalg.pinv(jac(x, poses, img_positions)).dot(fun(x, poses, img_positions))
-      x = x - delta
-      counter += 1
-    return [x]
-
-  def compute_pos_python(self, poses, img_positions, check_quality=False):
-    import scipy.optimize as opt
-
-    # This procedure is also described
-    # in the MSCKF paper (Mourikis et al. 2007)
-    x = np.array([img_positions[-1][0],
-                  img_positions[-1][1], 0.1])
-    res = opt.leastsq(self.residual, x, Dfun=self.residual_jac, args=(poses, img_positions))  # scipy opt
-    # res = self.gauss_newton(self.residual, self.residual_jac, x, (poses, img_positions)) # diy gauss_newton
-
-    alpha, beta, rho = res[0]
-    rot_0_to_g = (orient.rotations_from_quats(poses[-1, 3:])).dot(self.to_c.T)
-    return (rot_0_to_g.dot(np.array([alpha, beta, 1]))) / rho + poses[-1, :3]
-
-
-# EXPERIMENTAL CODE
-def unroll_shutter(img_positions, poses, v, rot_rates, ecef_pos):
-  # only speed correction for now
-  t_roll = 0.016  # 16ms rolling shutter?
-  vroll, vpitch, vyaw = rot_rates
-  A = 0.5 * np.array([[-1, -vroll, -vpitch, -vyaw],
-                      [vroll, 0, vyaw, -vpitch],
-                      [vpitch, -vyaw, 0, vroll],
-                      [vyaw, vpitch, -vroll, 0]])
-  q_dot = A.dot(poses[-1][3:7])
-  v = np.append(v, q_dot)
-  v = np.array([v[0], v[1], v[2], 0, 0, 0, 0])
-  current_pose = poses[-1] + v * 0.05
-  poses = np.vstack((current_pose, poses))
-  dt = -img_positions[:, 1] * t_roll / 0.48
-  errs = project(poses, ecef_pos) - project(poses + np.atleast_2d(dt).T.dot(np.atleast_2d(v)), ecef_pos)
-  return img_positions - errs
-
-
-def project(poses, ecef_pos):
-  img_positions = np.zeros((len(poses), 2))
-  for i, p in enumerate(poses):
-    cam_frame = orient.rotations_from_quats(p[3:]).T.dot(ecef_pos - p[:3])
-    img_positions[i] = np.array([cam_frame[1] / cam_frame[0], cam_frame[2] / cam_frame[0]])
-  return img_positions
-
-
-if __name__ == "__main__":
-  K = int(sys.argv[1].split("_")[-1])
-  LstSqComputer.generate_code(K=K)
-
diff --git a/selfdrive/locationd/kalman/helpers/sympy_helpers.py b/selfdrive/locationd/kalman/helpers/sympy_helpers.py
deleted file mode 100644
index dee9fb37..00000000
--- a/selfdrive/locationd/kalman/helpers/sympy_helpers.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env python3
-import sympy as sp
-import numpy as np
-
-
-def cross(x):
-  ret = sp.Matrix(np.zeros((3, 3)))
-  ret[0, 1], ret[0, 2] = -x[2], x[1]
-  ret[1, 0], ret[1, 2] = x[2], -x[0]
-  ret[2, 0], ret[2, 1] = -x[1], x[0]
-  return ret
-
-
-def euler_rotate(roll, pitch, yaw):
-  # make symbolic rotation matrix from eulers
-  matrix_roll = sp.Matrix([[1, 0, 0],
-                           [0, sp.cos(roll), -sp.sin(roll)],
-                           [0, sp.sin(roll), sp.cos(roll)]])
-  matrix_pitch = sp.Matrix([[sp.cos(pitch), 0, sp.sin(pitch)],
-                            [0, 1, 0],
-                            [-sp.sin(pitch), 0, sp.cos(pitch)]])
-  matrix_yaw = sp.Matrix([[sp.cos(yaw), -sp.sin(yaw), 0],
-                          [sp.sin(yaw), sp.cos(yaw), 0],
-                          [0, 0, 1]])
-  return matrix_yaw * matrix_pitch * matrix_roll
-
-
-def quat_rotate(q0, q1, q2, q3):
-  # make symbolic rotation matrix from quat
-  return sp.Matrix([[q0**2 + q1**2 - q2**2 - q3**2, 2 * (q1 * q2 + q0 * q3), 2 * (q1 * q3 - q0 * q2)],
-                    [2 * (q1 * q2 - q0 * q3), q0**2 - q1**2 + q2**2 - q3**2, 2 * (q2 * q3 + q0 * q1)],
-                    [2 * (q1 * q3 + q0 * q2), 2 * (q2 * q3 - q0 * q1), q0**2 - q1**2 - q2**2 + q3**2]]).T
-
-
-def quat_matrix_l(p):
-  return sp.Matrix([[p[0], -p[1], -p[2], -p[3]],
-                    [p[1],  p[0], -p[3],  p[2]],
-                    [p[2],  p[3],  p[0], -p[1]],
-                    [p[3], -p[2],  p[1],  p[0]]])
-
-
-def quat_matrix_r(p):
-  return sp.Matrix([[p[0], -p[1], -p[2], -p[3]],
-                    [p[1],  p[0],  p[3], -p[2]],
-                    [p[2], -p[3],  p[0],  p[1]],
-                    [p[3],  p[2], -p[1],  p[0]]])
-
-
-def sympy_into_c(sympy_functions, global_vars=None):
-  from sympy.utilities import codegen
-  routines = []
-  for name, expr, args in sympy_functions:
-    r = codegen.make_routine(name, expr, language="C99", global_vars=global_vars)
-
-    # argument ordering input to sympy is broken with function with output arguments
-    nargs = []
-
-    # reorder the input arguments
-    for aa in args:
-      if aa is None:
-        nargs.append(codegen.InputArgument(sp.Symbol('unused'), dimensions=[1, 1]))
-        continue
-      found = False
-      for a in r.arguments:
-        if str(aa.name) == str(a.name):
-          nargs.append(a)
-          found = True
-          break
-      if not found:
-        # [1,1] is a hack for Matrices
-        nargs.append(codegen.InputArgument(aa, dimensions=[1, 1]))
-
-    # add the output arguments
-    for a in r.arguments:
-      if type(a) == codegen.OutputArgument:
-        nargs.append(a)
-
-    # assert len(r.arguments) == len(args)+1
-    r.arguments = nargs
-
-    # add routine to list
-    routines.append(r)
-
-  [(c_name, c_code), (h_name, c_header)] = codegen.get_code_generator('C', 'ekf', 'C99').write(routines, "ekf")
-  c_header = '\n'.join(x for x in c_header.split("\n") if len(x) > 0 and x[0] != '#')
-
-  c_code = '\n'.join(x for x in c_code.split("\n") if len(x) > 0 and x[0] != '#')
-  c_code = 'extern "C" {\n#include <math.h>\n' + c_code + "\n}\n"
-
-  return c_header, c_code
diff --git a/selfdrive/locationd/kalman/models/__init__.py b/selfdrive/locationd/kalman/models/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/selfdrive/locationd/kalman/templates/compute_pos.c b/selfdrive/locationd/kalman/templates/compute_pos.c
deleted file mode 100644
index 3c7b16ef..00000000
--- a/selfdrive/locationd/kalman/templates/compute_pos.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <eigen3/Eigen/QR>
-#include <eigen3/Eigen/Dense>
-#include <iostream>
-
-typedef Eigen::Matrix<double, KDIM*2, 3, Eigen::RowMajor> R3M;
-typedef Eigen::Matrix<double, KDIM*2, 1> R1M;
-typedef Eigen::Matrix<double, 3, 1> O1M;
-typedef Eigen::Matrix<double, 3, 3, Eigen::RowMajor> M3D;
-
-extern "C" {
-void gauss_newton(double *in_x, double *in_poses, double *in_img_positions) {
-
-  double res[KDIM*2] = {0};
-  double jac[KDIM*6] = {0};
-
-  O1M x(in_x);
-  O1M delta;
-  int counter = 0;
-  while ((delta.squaredNorm() > 0.0001 and counter < 30) or counter == 0){
-    res_fun(in_x, in_poses, in_img_positions, res);
-    jac_fun(in_x, in_poses, in_img_positions, jac);
-    R1M E(res); R3M J(jac);
-    delta = (J.transpose()*J).inverse() * J.transpose() * E;
-    x = x - delta;
-    memcpy(in_x, x.data(), 3 * sizeof(double));
-    counter = counter + 1;
-  }
-}
-
-
-void compute_pos(double *to_c, double *poses, double *img_positions, double *param, double *pos) {
-    param[0] = img_positions[KDIM*2-2];
-    param[1] = img_positions[KDIM*2-1];
-    param[2] = 0.1;
-    gauss_newton(param, poses, img_positions);
-
-    Eigen::Quaterniond q;
-    q.w() = poses[KDIM*7-4];
-    q.x() = poses[KDIM*7-3];
-    q.y() = poses[KDIM*7-2];
-    q.z() = poses[KDIM*7-1];
-    M3D RC(to_c);
-    Eigen::Matrix3d R = q.normalized().toRotationMatrix();
-    Eigen::Matrix3d rot = R * RC.transpose();
-
-    pos[0] = param[0]/param[2];
-    pos[1] = param[1]/param[2];
-    pos[2] = 1.0/param[2];
-    O1M ecef_offset(poses + KDIM*7-7);
-    O1M ecef_output(pos);
-    ecef_output = rot*ecef_output + ecef_offset;
-    memcpy(pos, ecef_output.data(), 3 * sizeof(double));
-}
-}
diff --git a/selfdrive/locationd/kalman/templates/ekf_c.c b/selfdrive/locationd/kalman/templates/ekf_c.c
deleted file mode 100644
index e524f81e..00000000
--- a/selfdrive/locationd/kalman/templates/ekf_c.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include <eigen3/Eigen/Dense>
-#include <iostream>
-
-typedef Eigen::Matrix<double, DIM, DIM, Eigen::RowMajor> DDM;
-typedef Eigen::Matrix<double, EDIM, EDIM, Eigen::RowMajor> EEM;
-typedef Eigen::Matrix<double, DIM, EDIM, Eigen::RowMajor> DEM;
-
-void predict(double *in_x, double *in_P, double *in_Q, double dt) {
-  typedef Eigen::Matrix<double, MEDIM, MEDIM, Eigen::RowMajor> RRM;
-  
-  double nx[DIM] = {0};
-  double in_F[EDIM*EDIM] = {0};
-
-  // functions from sympy
-  f_fun(in_x, dt, nx);
-  F_fun(in_x, dt, in_F);
-
-
-  EEM F(in_F);
-  EEM P(in_P);
-  EEM Q(in_Q);
-
-  RRM F_main = F.topLeftCorner(MEDIM, MEDIM);
-  P.topLeftCorner(MEDIM, MEDIM) = (F_main * P.topLeftCorner(MEDIM, MEDIM)) * F_main.transpose();
-  P.topRightCorner(MEDIM, EDIM - MEDIM) = F_main * P.topRightCorner(MEDIM, EDIM - MEDIM);
-  P.bottomLeftCorner(EDIM - MEDIM, MEDIM) = P.bottomLeftCorner(EDIM - MEDIM, MEDIM) * F_main.transpose();
-
-  P = P + dt*Q;
-
-  // copy out state
-  memcpy(in_x, nx, DIM * sizeof(double));
-  memcpy(in_P, P.data(), EDIM * EDIM * sizeof(double));
-}
-
-// note: extra_args dim only correct when null space projecting
-// otherwise 1
-template <int ZDIM, int EADIM, bool MAHA_TEST>
-void update(double *in_x, double *in_P, Hfun h_fun, Hfun H_fun, Hfun Hea_fun, double *in_z, double *in_R, double *in_ea, double MAHA_THRESHOLD) {
-  typedef Eigen::Matrix<double, ZDIM, ZDIM, Eigen::RowMajor> ZZM;
-  typedef Eigen::Matrix<double, ZDIM, DIM, Eigen::RowMajor> ZDM;
-  typedef Eigen::Matrix<double, Eigen::Dynamic, EDIM, Eigen::RowMajor> XEM;
-  //typedef Eigen::Matrix<double, EDIM, ZDIM, Eigen::RowMajor> EZM;
-  typedef Eigen::Matrix<double, Eigen::Dynamic, 1> X1M;
-  typedef Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> XXM;
-
-  double in_hx[ZDIM] = {0};
-  double in_H[ZDIM * DIM] = {0};
-  double in_H_mod[EDIM * DIM] = {0};
-  double delta_x[EDIM] = {0};
-  double x_new[DIM] = {0};
-
-
-  // state x, P
-  Eigen::Matrix<double, ZDIM, 1> z(in_z);
-  EEM P(in_P);
-  ZZM pre_R(in_R);
-  
-  // functions from sympy
-  h_fun(in_x, in_ea, in_hx);
-  H_fun(in_x, in_ea, in_H);
-  ZDM pre_H(in_H); 
-  
-  // get y (y = z - hx)
-  Eigen::Matrix<double, ZDIM, 1> pre_y(in_hx); pre_y = z - pre_y;
-  X1M y; XXM H; XXM R;
-  if (Hea_fun){
-    typedef Eigen::Matrix<double, ZDIM, EADIM, Eigen::RowMajor> ZAM;
-    double in_Hea[ZDIM * EADIM] = {0};
-    Hea_fun(in_x, in_ea, in_Hea);
-    ZAM Hea(in_Hea);
-    XXM A = Hea.transpose().fullPivLu().kernel();
-   
-
-    y = A.transpose() * pre_y;
-    H = A.transpose() * pre_H;
-    R = A.transpose() * pre_R * A;
-  } else {
-    y = pre_y;
-    H = pre_H;
-    R = pre_R;
-  }
-  // get modified H
-  H_mod_fun(in_x, in_H_mod);
-  DEM H_mod(in_H_mod);
-  XEM H_err = H * H_mod;
-  
-  // Do mahalobis distance test
-  if (MAHA_TEST){
-    XXM a = (H_err * P * H_err.transpose() + R).inverse();
-    double maha_dist = y.transpose() * a * y;
-    if (maha_dist > MAHA_THRESHOLD){
-      R = 1.0e16 * R;
-    }
-  }
-
-  // Outlier resilient weighting
-  double weight = 1;//(1.5)/(1 + y.squaredNorm()/R.sum());
-
-  // kalman gains and I_KH
-  XXM S = ((H_err * P) * H_err.transpose()) + R/weight;
-  XEM KT = S.fullPivLu().solve(H_err * P.transpose());
-  //EZM K = KT.transpose(); TODO: WHY DOES THIS NOT COMPILE?
-  //EZM K = S.fullPivLu().solve(H_err * P.transpose()).transpose();
-  //std::cout << "Here is the matrix rot:\n" << K << std::endl;
-  EEM I_KH = Eigen::Matrix<double, EDIM, EDIM>::Identity() - (KT.transpose() * H_err);
-
-  // update state by injecting dx
-  Eigen::Matrix<double, EDIM, 1> dx(delta_x);
-  dx  = (KT.transpose() * y);
-  memcpy(delta_x, dx.data(), EDIM * sizeof(double));
-  err_fun(in_x, delta_x, x_new);
-  Eigen::Matrix<double, DIM, 1> x(x_new);
- 
-  // update cov 
-  P = ((I_KH * P) * I_KH.transpose()) + ((KT.transpose() * R) * KT);
-
-  // copy out state
-  memcpy(in_x, x.data(), DIM * sizeof(double));
-  memcpy(in_P, P.data(), EDIM * EDIM * sizeof(double));
-  memcpy(in_z, y.data(), y.rows() * sizeof(double));
-}
-
-
diff --git a/selfdrive/locationd/kalman/templates/feature_handler.c b/selfdrive/locationd/kalman/templates/feature_handler.c
deleted file mode 100644
index 33097233..00000000
--- a/selfdrive/locationd/kalman/templates/feature_handler.c
+++ /dev/null
@@ -1,58 +0,0 @@
-extern "C"{
-bool sane(double track [K + 1][5]) {
-  double diffs_x [K-1];
-  double diffs_y [K-1];
-  int i;
-  for (i = 0; i < K-1; i++) {
-    diffs_x[i] = fabs(track[i+2][2] - track[i+1][2]);
-    diffs_y[i] = fabs(track[i+2][3] - track[i+1][3]);
-  }
-  for (i = 1; i < K-1; i++) {
-    if (((diffs_x[i] > 0.05 or diffs_x[i-1] > 0.05) and
-         (diffs_x[i] > 2*diffs_x[i-1] or
-          diffs_x[i] < .5*diffs_x[i-1])) or
-        ((diffs_y[i] > 0.05 or diffs_y[i-1] > 0.05) and
-	 (diffs_y[i] > 2*diffs_y[i-1] or
-          diffs_y[i] < .5*diffs_y[i-1]))){
-      return false;
-    }
-  }
-  return true;
-}
-
-void merge_features(double *tracks, double *features, long long *empty_idxs) {
-  double feature_arr [3000][5];
-  memcpy(feature_arr, features, 3000 * 5 * sizeof(double));
-  double track_arr [6000][K + 1][5];
-  memcpy(track_arr, tracks, (K+1) * 6000 * 5 * sizeof(double));
-  int match;
-  int empty_idx = 0;
-  int idx;
-  for (int i = 0; i < 3000; i++) {
-    match = feature_arr[i][4];
-    if (track_arr[match][0][1] == match and track_arr[match][0][2] == 0){
-      track_arr[match][0][0] = track_arr[match][0][0] + 1;
-      track_arr[match][0][1] = feature_arr[i][1];
-      track_arr[match][0][2] = 1;
-      idx = track_arr[match][0][0];
-      memcpy(track_arr[match][idx], feature_arr[i], 5 * sizeof(double));
-      if (idx == K){
-        // label complete
-        track_arr[match][0][3] = 1;
-	if (sane(track_arr[match])){
-          // label valid
-          track_arr[match][0][4] = 1;
-	}
-      }
-    } else {
-      // gen new track with this feature
-      track_arr[empty_idxs[empty_idx]][0][0] = 1;
-      track_arr[empty_idxs[empty_idx]][0][1] = feature_arr[i][1];
-      track_arr[empty_idxs[empty_idx]][0][2] = 1;
-      memcpy(track_arr[empty_idxs[empty_idx]][1], feature_arr[i], 5 * sizeof(double));
-      empty_idx = empty_idx + 1;
-    }
-  }
-  memcpy(tracks, track_arr, (K+1) * 6000 * 5 * sizeof(double));
-}
-}
diff --git a/selfdrive/locationd/locationd.py b/selfdrive/locationd/locationd.py
old mode 100644
new mode 100755
index a147dde5..7075fdf3
--- a/selfdrive/locationd/locationd.py
+++ b/selfdrive/locationd/locationd.py
@@ -11,14 +11,16 @@ from common.transformations.orientation import (ecef_euler_from_ned,
                                                 ned_euler_from_ecef,
                                                 quat_from_euler,
                                                 rot_from_quat, rot_from_euler)
-from selfdrive.locationd.kalman.helpers import ObservationKind, KalmanError
-from selfdrive.locationd.kalman.models.live_kf import LiveKalman, States
+from rednose.helpers import KalmanError
+from selfdrive.locationd.models.live_kf import LiveKalman, States, ObservationKind
+from selfdrive.locationd.models.constants import GENERATED_DIR
 from selfdrive.swaglog import cloudlog
+
 #from datetime import datetime
 #from laika.gps_time import GPSTime
 
 from sympy.utilities.lambdify import lambdify
-from selfdrive.locationd.kalman.helpers.sympy_helpers import euler_rotate
+from rednose.helpers.sympy_helpers import euler_rotate
 
 
 VISION_DECIMATION = 2
@@ -47,7 +49,7 @@ def get_H():
 
 class Localizer():
   def __init__(self, disabled_logs=[], dog=None):
-    self.kf = LiveKalman()
+    self.kf = LiveKalman(GENERATED_DIR)
     self.reset_kalman()
     self.max_age = .2  # seconds
     self.disabled_logs = disabled_logs
diff --git a/selfdrive/locationd/kalman/.gitignore b/selfdrive/locationd/models/.gitignore
similarity index 100%
rename from selfdrive/locationd/kalman/.gitignore
rename to selfdrive/locationd/models/.gitignore
diff --git a/selfdrive/locationd/models/SConscript b/selfdrive/locationd/models/SConscript
new file mode 100644
index 00000000..c8b5c93f
--- /dev/null
+++ b/selfdrive/locationd/models/SConscript
@@ -0,0 +1,36 @@
+Import('env', 'arch')
+
+templates = Glob('#rednose/templates/*')
+
+sympy_helpers = "#rednose/helpers/sympy_helpers.py"
+ekf_sym = "#rednose/helpers/ekf_sym.py"
+
+to_build = {
+    'live': ('live_kf.py', 'generated'),
+    'car': ('car_kf.py', 'generated'),
+}
+
+if arch != "aarch64":
+    to_build.update({
+        'gnss': ('gnss_kf.py', 'generated'),
+        'loc_4': ('loc_kf.py', 'generated'),
+        'pos_computer_4': ('#rednose/helpers/lst_sq_computer.py', 'generated'),
+        'pos_computer_5': ('#rednose/helpers/lst_sq_computer.py', 'generated'),
+        'feature_handler_5': ('#rednose/helpers/feature_handler.py', 'generated'),
+    })
+
+found = {}
+
+for target, (command, generated_folder) in to_build.items():
+    if File(command).exists():
+        found[target] = (command, generated_folder)
+
+for target, (command, generated_folder) in found.items():
+    target_files = File([f'{generated_folder}/{target}.cpp', f'{generated_folder}/{target}.h'])
+    command_file = File(command)
+
+    env.Command(target_files,
+                [templates, command_file, sympy_helpers, ekf_sym],
+                command_file.get_abspath() + " " + target + " " + Dir(generated_folder).get_abspath())
+
+    env.SharedLibrary(f'{generated_folder}/' + target, target_files[0])
diff --git a/selfdrive/locationd/kalman/__init__.py b/selfdrive/locationd/models/__init__.py
similarity index 100%
rename from selfdrive/locationd/kalman/__init__.py
rename to selfdrive/locationd/models/__init__.py
diff --git a/selfdrive/locationd/kalman/models/car_kf.py b/selfdrive/locationd/models/car_kf.py
similarity index 87%
rename from selfdrive/locationd/kalman/models/car_kf.py
rename to selfdrive/locationd/models/car_kf.py
index d6557202..79076703 100755
--- a/selfdrive/locationd/kalman/models/car_kf.py
+++ b/selfdrive/locationd/models/car_kf.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
+import sys
 
 import math
 import numpy as np
 import sympy as sp
 
-from selfdrive.locationd.kalman.helpers import ObservationKind
-from selfdrive.locationd.kalman.helpers.ekf_sym import EKF_sym, gen_code
+from selfdrive.locationd.models.constants import ObservationKind
+from rednose.helpers.ekf_sym import EKF_sym, gen_code
 
 i = 0
 
@@ -76,7 +77,7 @@ class CarKalman():
   ]
 
   @staticmethod
-  def generate_code():
+  def generate_code(generated_dir):
     dim_state = CarKalman.x_initial.shape[0]
     name = CarKalman.name
     maha_test_kinds = CarKalman.maha_test_kinds
@@ -136,9 +137,9 @@ class CarKalman():
       [sp.Matrix([x]), ObservationKind.STIFFNESS, None],
     ]
 
-    gen_code(name, f_sym, dt, state_sym, obs_eqs, dim_state, dim_state, maha_test_kinds=maha_test_kinds, global_vars=CarKalman.global_vars)
+    gen_code(generated_dir, name, f_sym, dt, state_sym, obs_eqs, dim_state, dim_state, maha_test_kinds=maha_test_kinds, global_vars=CarKalman.global_vars)
 
-  def __init__(self, steer_ratio=15, stiffness_factor=1, angle_offset=0):
+  def __init__(self, generated_dir, steer_ratio=15, stiffness_factor=1, angle_offset=0):
     self.dim_state = self.x_initial.shape[0]
     x_init = self.x_initial
     x_init[States.STEER_RATIO] = steer_ratio
@@ -146,7 +147,7 @@ class CarKalman():
     x_init[States.ANGLE_OFFSET] = angle_offset
 
     # init filter
-    self.filter = EKF_sym(self.name, self.Q, self.x_initial, self.P_initial, self.dim_state, self.dim_state, maha_test_kinds=self.maha_test_kinds, global_vars=self.global_vars)
+    self.filter = EKF_sym(generated_dir, self.name, self.Q, self.x_initial, self.P_initial, self.dim_state, self.dim_state, maha_test_kinds=self.maha_test_kinds, global_vars=self.global_vars)
 
   @property
   def x(self):
@@ -190,4 +191,5 @@ class CarKalman():
 
 
 if __name__ == "__main__":
-  CarKalman.generate_code()
+  generated_dir = sys.argv[2]
+  CarKalman.generate_code(generated_dir)
diff --git a/selfdrive/locationd/models/constants.py b/selfdrive/locationd/models/constants.py
new file mode 100644
index 00000000..8b99fce6
--- /dev/null
+++ b/selfdrive/locationd/models/constants.py
@@ -0,0 +1,79 @@
+import os
+
+GENERATED_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), 'generated'))
+
+class ObservationKind:
+  UNKNOWN = 0
+  NO_OBSERVATION = 1
+  GPS_NED = 2
+  ODOMETRIC_SPEED = 3
+  PHONE_GYRO = 4
+  GPS_VEL = 5
+  PSEUDORANGE_GPS = 6
+  PSEUDORANGE_RATE_GPS = 7
+  SPEED = 8
+  NO_ROT = 9
+  PHONE_ACCEL = 10
+  ORB_POINT = 11
+  ECEF_POS = 12
+  CAMERA_ODO_TRANSLATION = 13
+  CAMERA_ODO_ROTATION = 14
+  ORB_FEATURES = 15
+  MSCKF_TEST = 16
+  FEATURE_TRACK_TEST = 17
+  LANE_PT = 18
+  IMU_FRAME = 19
+  PSEUDORANGE_GLONASS = 20
+  PSEUDORANGE_RATE_GLONASS = 21
+  PSEUDORANGE = 22
+  PSEUDORANGE_RATE = 23
+
+  ROAD_FRAME_XY_SPEED = 24  # (x, y) [m/s]
+  ROAD_FRAME_YAW_RATE = 25  # [rad/s]
+  STEER_ANGLE = 26  # [rad]
+  ANGLE_OFFSET_FAST = 27  # [rad]
+  STIFFNESS = 28  # [-]
+  STEER_RATIO = 29  # [-]
+  ROAD_FRAME_X_SPEED = 30  # (x) [m/s]
+
+  names = [
+    'Unknown',
+    'No observation',
+    'GPS NED',
+    'Odometric speed',
+    'Phone gyro',
+    'GPS velocity',
+    'GPS pseudorange',
+    'GPS pseudorange rate',
+    'Speed',
+    'No rotation',
+    'Phone acceleration',
+    'ORB point',
+    'ECEF pos',
+    'camera odometric translation',
+    'camera odometric rotation',
+    'ORB features',
+    'MSCKF test',
+    'Feature track test',
+    'Lane ecef point',
+    'imu frame eulers',
+    'GLONASS pseudorange',
+    'GLONASS pseudorange rate',
+
+    'Road Frame x,y speed',
+    'Road Frame yaw rate',
+    'Steer Angle',
+    'Fast Angle Offset',
+    'Stiffness',
+    'Steer Ratio',
+  ]
+
+  @classmethod
+  def to_string(cls, kind):
+    return cls.names[kind]
+
+
+SAT_OBS = [ObservationKind.PSEUDORANGE_GPS,
+           ObservationKind.PSEUDORANGE_RATE_GPS,
+           ObservationKind.PSEUDORANGE_GLONASS,
+           ObservationKind.PSEUDORANGE_RATE_GLONASS]
diff --git a/selfdrive/locationd/kalman/models/gnss_kf.py b/selfdrive/locationd/models/gnss_kf.py
similarity index 89%
rename from selfdrive/locationd/kalman/models/gnss_kf.py
rename to selfdrive/locationd/models/gnss_kf.py
index 5c77be3d..a672e67e 100755
--- a/selfdrive/locationd/kalman/models/gnss_kf.py
+++ b/selfdrive/locationd/models/gnss_kf.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
+import sys
 
 import numpy as np
 import sympy as sp
 
-from selfdrive.locationd.kalman.helpers import ObservationKind
-from selfdrive.locationd.kalman.helpers.ekf_sym import EKF_sym, gen_code
-from selfdrive.locationd.kalman.models.loc_kf import parse_pr, parse_prr
+from selfdrive.locationd.models.constants import ObservationKind
+from rednose.helpers.ekf_sym import EKF_sym, gen_code
+from selfdrive.locationd.models.loc_kf import parse_pr, parse_prr
 
 
 class States():
@@ -41,7 +42,7 @@ class GNSSKalman():
   maha_test_kinds = []  # ObservationKind.PSEUDORANGE_RATE, ObservationKind.PSEUDORANGE, ObservationKind.PSEUDORANGE_GLONASS]
 
   @staticmethod
-  def generate_code():
+  def generate_code(generated_dir):
     dim_state = GNSSKalman.x_initial.shape[0]
     name = GNSSKalman.name
     maha_test_kinds = GNSSKalman.maha_test_kinds
@@ -111,13 +112,13 @@ class GNSSKalman():
                [h_pseudorange_rate_sym, ObservationKind.PSEUDORANGE_RATE_GPS, sat_pos_vel_sym],
                [h_pseudorange_rate_sym, ObservationKind.PSEUDORANGE_RATE_GLONASS, sat_pos_vel_sym]]
 
-    gen_code(name, f_sym, dt, state_sym, obs_eqs, dim_state, dim_state, maha_test_kinds=maha_test_kinds)
+    gen_code(generated_dir, name, f_sym, dt, state_sym, obs_eqs, dim_state, dim_state, maha_test_kinds=maha_test_kinds)
 
-  def __init__(self):
+  def __init__(self, generated_dir):
     self.dim_state = self.x_initial.shape[0]
 
     # init filter
-    self.filter = EKF_sym(self.name, self.Q, self.x_initial, self.P_initial, self.dim_state, self.dim_state, maha_test_kinds=self.maha_test_kinds)
+    self.filter = EKF_sym(generated_dir, self.name, self.Q, self.x_initial, self.P_initial, self.dim_state, self.dim_state, maha_test_kinds=self.maha_test_kinds)
 
   @property
   def x(self):
@@ -175,4 +176,5 @@ class GNSSKalman():
 
 
 if __name__ == "__main__":
-  GNSSKalman.generate_code()
+  generated_dir = sys.argv[2]
+  GNSSKalman.generate_code(generated_dir)
diff --git a/selfdrive/locationd/kalman/models/live_kf.py b/selfdrive/locationd/models/live_kf.py
similarity index 93%
rename from selfdrive/locationd/kalman/models/live_kf.py
rename to selfdrive/locationd/models/live_kf.py
index 1ee8d74a..f2c00e58 100755
--- a/selfdrive/locationd/kalman/models/live_kf.py
+++ b/selfdrive/locationd/models/live_kf.py
@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
+import sys
+
 import numpy as np
 import sympy as sp
 
-from selfdrive.locationd.kalman.helpers import KalmanError, ObservationKind
-from selfdrive.locationd.kalman.helpers.ekf_sym import EKF_sym, gen_code
-from selfdrive.locationd.kalman.helpers.sympy_helpers import (euler_rotate,
-                                                              quat_matrix_r,
-                                                              quat_rotate)
-from selfdrive.swaglog import cloudlog
+from selfdrive.locationd.models.constants import ObservationKind
+from rednose.helpers import KalmanError
+from rednose.helpers.ekf_sym import EKF_sym, gen_code
+from rednose.helpers.sympy_helpers import euler_rotate, quat_matrix_r, quat_rotate
 
 EARTH_GM = 3.986005e14  # m^3/s^2 (gravitational constant * mass of earth)
 
@@ -66,7 +66,7 @@ class LiveKalman():
                (0.05 / 60)**2, (0.05 / 60)**2, (0.05 / 60)**2])
 
   @staticmethod
-  def generate_code():
+  def generate_code(generated_dir):
     name = LiveKalman.name
     dim_state = LiveKalman.initial_x.shape[0]
     dim_state_err = LiveKalman.initial_P_diag.shape[0]
@@ -185,9 +185,9 @@ class LiveKalman():
                [h_phone_rot_sym, ObservationKind.CAMERA_ODO_ROTATION, None],
                [h_imu_frame_sym, ObservationKind.IMU_FRAME, None]]
 
-    gen_code(name, f_sym, dt, state_sym, obs_eqs, dim_state, dim_state_err, eskf_params)
+    gen_code(generated_dir, name, f_sym, dt, state_sym, obs_eqs, dim_state, dim_state_err, eskf_params)
 
-  def __init__(self):
+  def __init__(self, generated_dir):
     self.dim_state = self.initial_x.shape[0]
     self.dim_state_err = self.initial_P_diag.shape[0]
 
@@ -200,7 +200,7 @@ class LiveKalman():
                       ObservationKind.ECEF_POS: np.diag([5**2, 5**2, 5**2])}
 
     # init filter
-    self.filter = EKF_sym(self.name, self.Q, self.initial_x, np.diag(self.initial_P_diag), self.dim_state, self.dim_state_err)
+    self.filter = EKF_sym(generated_dir, self.name, self.Q, self.initial_x, np.diag(self.initial_P_diag), self.dim_state, self.dim_state_err)
 
   @property
   def x(self):
@@ -243,8 +243,7 @@ class LiveKalman():
 
     # Should not continue if the quats behave this weirdly
     if not (0.1 < quat_norm < 10):
-      cloudlog.error("Kalman filter quaternions unstable")
-      raise KalmanError
+      raise KalmanError("Kalman filter quaternions unstable")
 
     self.filter.x[States.ECEF_ORIENTATION, 0] = self.filter.x[States.ECEF_ORIENTATION, 0] / quat_norm
 
@@ -281,4 +280,5 @@ class LiveKalman():
 
 
 if __name__ == "__main__":
-  LiveKalman.generate_code()
+  generated_dir = sys.argv[2]
+  LiveKalman.generate_code(generated_dir)
diff --git a/selfdrive/locationd/kalman/models/loc_kf.py b/selfdrive/locationd/models/loc_kf.py
similarity index 96%
rename from selfdrive/locationd/kalman/models/loc_kf.py
rename to selfdrive/locationd/models/loc_kf.py
index 86f31a8c..7401fa8b 100755
--- a/selfdrive/locationd/kalman/models/loc_kf.py
+++ b/selfdrive/locationd/models/loc_kf.py
@@ -1,14 +1,15 @@
 #!/usr/bin/env python3
 
+import sys
+
 import numpy as np
 import sympy as sp
 
-from selfdrive.locationd.kalman.helpers import ObservationKind
-from selfdrive.locationd.kalman.helpers.ekf_sym import EKF_sym, gen_code
-from selfdrive.locationd.kalman.helpers.lst_sq_computer import LstSqComputer
-from selfdrive.locationd.kalman.helpers.sympy_helpers import (euler_rotate,
-                                                              quat_matrix_r,
-                                                              quat_rotate)
+from selfdrive.locationd.models.constants import ObservationKind
+from rednose.helpers.ekf_sym import EKF_sym, gen_code
+from rednose.helpers.lst_sq_computer import LstSqComputer
+from rednose.helpers.sympy_helpers import euler_rotate, quat_matrix_r, quat_rotate
+
 EARTH_GM = 3.986005e14  # m^3/s^2 (gravitational constant * mass of earth)
 
 
@@ -114,7 +115,7 @@ class LocKalman():
   dim_augment_err = 6
 
   @staticmethod
-  def generate_code(N=4):
+  def generate_code(generated_dir, N=4):
     dim_augment = LocKalman.dim_augment
     dim_augment_err = LocKalman.dim_augment_err
 
@@ -355,9 +356,9 @@ class LocKalman():
       msckf_params = [dim_main, dim_augment, dim_main_err, dim_augment_err, N, [ObservationKind.MSCKF_TEST, ObservationKind.ORB_FEATURES]]
     else:
       msckf_params = None
-    gen_code(name, f_sym, dt, state_sym, obs_eqs, dim_state, dim_state_err, eskf_params, msckf_params, maha_test_kinds)
+    gen_code(generated_dir, name, f_sym, dt, state_sym, obs_eqs, dim_state, dim_state_err, eskf_params, msckf_params, maha_test_kinds)
 
-  def __init__(self, N=4, max_tracks=3000):
+  def __init__(self, generated_dir, N=4, max_tracks=3000):
     name = f"{self.name}_{N}"
 
     self.obs_noise = {ObservationKind.ODOMETRIC_SPEED: np.atleast_2d(0.2**2),
@@ -377,11 +378,11 @@ class LocKalman():
 
     if self.N > 0:
       x_initial, P_initial, Q = self.pad_augmented(self.x_initial, self.P_initial, self.Q)
-      self.computer = LstSqComputer(N)
+      self.computer = LstSqComputer(generated_dir, N)
       self.max_tracks = max_tracks
 
     # init filter
-    self.filter = EKF_sym(name, Q, x_initial, P_initial, self.dim_main, self.dim_main_err,
+    self.filter = EKF_sym(generated_dir, name, Q, x_initial, P_initial, self.dim_main, self.dim_main_err,
                           N, self.dim_augment, self.dim_augment_err, self.maha_test_kinds)
 
   @property
@@ -584,4 +585,5 @@ class LocKalman():
 
 
 if __name__ == "__main__":
-  LocKalman.generate_code(N=4)
+  generated_dir = sys.argv[2]
+  LocKalman.generate_code(generated_dir, N=4)
diff --git a/selfdrive/locationd/paramsd.py b/selfdrive/locationd/paramsd.py
index aaf5017d..e359870b 100755
--- a/selfdrive/locationd/paramsd.py
+++ b/selfdrive/locationd/paramsd.py
@@ -7,8 +7,8 @@ import numpy as np
 import cereal.messaging as messaging
 from cereal import car
 from common.params import Params, put_nonblocking
-from selfdrive.locationd.kalman.models.car_kf import (CarKalman,
-                                                      ObservationKind, States)
+from selfdrive.locationd.models.car_kf import CarKalman, ObservationKind, States
+from selfdrive.locationd.models.constants import GENERATED_DIR
 from selfdrive.swaglog import cloudlog
 
 CARSTATE_DECIMATION = 5
@@ -16,7 +16,7 @@ CARSTATE_DECIMATION = 5
 
 class ParamsLearner:
   def __init__(self, CP, steer_ratio, stiffness_factor, angle_offset):
-    self.kf = CarKalman(steer_ratio, stiffness_factor, angle_offset)
+    self.kf = CarKalman(GENERATED_DIR, steer_ratio, stiffness_factor, angle_offset)
 
     self.kf.filter.set_mass(CP.mass)  # pylint: disable=no-member
     self.kf.filter.set_rotational_inertia(CP.rotationalInertia)  # pylint: disable=no-member