fix up dependencies, remove ones we no longer need