Cleaned Peer related stuff