Cleaning up now proper peer list processing