Cleaning up webrtc samples, follow up changes.