Merge "Clean up when we switch networks."
tree: 3f0d2ab28fe6a9e7c25ce9a9bd52003c4d752afd
  1. core/
  2. services/
  3. tests/