remove toolbox dependency, cleanup imports