* Import adjustments
* remove unnecessary imports * improve if self-address peer comparison to avoid some config reads