[cleanup] adios janky code