Remove SiteFiles injection from PeerFinder
Add pending_handlers