Added Peer/Master Timeout and Removal