=== modified file 'src/client/buffer_factory.cpp'
--- src/client/buffer_factory.cpp	2016-06-24 18:19:58 +0000
+++ src/client/buffer_factory.cpp	2016-08-03 06:51:52 +0000
@@ -86,7 +86,7 @@
     }
 
     allocation_requests.erase(request_it);
-    return std::move(b);
+    return b;
 }
 
 void mcl::BufferFactory::cancel_requests_with_context(void* cancelled_context)

=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
--- src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-06-24 17:52:00 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-08-03 06:51:52 +0000
@@ -52,11 +52,6 @@
 namespace md = mir::dispatch;
 namespace mp = mir::protobuf;
 
-namespace
-{
-std::chrono::milliseconds const timeout(200);
-}
-
 mclr::MirProtobufRpcChannel::MirProtobufRpcChannel(
     std::unique_ptr<mclr::StreamTransport> transport,
     std::shared_ptr<mcl::SurfaceMap> const& surface_map,

=== modified file 'src/platforms/eglstream-kms/client/client_platform.cpp'
--- src/platforms/eglstream-kms/client/client_platform.cpp	2016-05-31 01:21:42 +0000
+++ src/platforms/eglstream-kms/client/client_platform.cpp	2016-08-03 06:51:52 +0000
@@ -29,8 +29,7 @@
 namespace mcle=mir::client::eglstream;
 namespace geom=mir::geometry;
 
-mcle::ClientPlatform::ClientPlatform(ClientContext* const context)
-    : context{context}
+mcle::ClientPlatform::ClientPlatform(ClientContext* const)
 {
 }
 

=== modified file 'src/platforms/eglstream-kms/client/client_platform.h'
--- src/platforms/eglstream-kms/client/client_platform.h	2016-05-31 01:21:42 +0000
+++ src/platforms/eglstream-kms/client/client_platform.h	2016-08-03 06:51:52 +0000
@@ -30,7 +30,7 @@
 class ClientPlatform : public client::ClientPlatform
 {
 public:
-    ClientPlatform(ClientContext* const context);
+    ClientPlatform(ClientContext* const);
 
     MirPlatformType platform_type() const override;
     void populate(MirPlatformPackage& package) const override;
@@ -40,9 +40,6 @@
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() override;
     MirNativeBuffer* convert_native_buffer(graphics::NativeBuffer*) const override;
     MirPixelFormat get_egl_pixel_format(EGLDisplay, EGLConfig) const override;
-
-private:
-    ClientContext* const context;
 };
 
 }

=== modified file 'src/platforms/eglstream-kms/server/platform.cpp'
--- src/platforms/eglstream-kms/server/platform.cpp	2016-07-20 04:54:07 +0000
+++ src/platforms/eglstream-kms/server/platform.cpp	2016-08-03 06:51:52 +0000
@@ -55,8 +55,7 @@
     EGLDeviceEXT device,
     std::shared_ptr<EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
     std::shared_ptr<DisplayReport> const& /*report*/)
-    : device{device},
-      display{EGL_NO_DISPLAY},
+    : display{EGL_NO_DISPLAY},
       drm_node{open(drm_node_for_device(device), O_RDWR | O_CLOEXEC)}
 {
     using namespace std::literals;

=== modified file 'src/platforms/eglstream-kms/server/platform.h'
--- src/platforms/eglstream-kms/server/platform.h	2016-07-20 04:54:07 +0000
+++ src/platforms/eglstream-kms/server/platform.h	2016-08-03 06:51:52 +0000
@@ -53,7 +53,6 @@
     UniqueModulePtr<PlatformIpcOperations> make_ipc_operations() const override;
 
 private:
-    EGLDeviceEXT device;
     EGLDisplay display;
     mir::Fd const drm_node;
 };

=== modified file 'tests/unit-tests/client/test_no_tls_future.cpp'
--- tests/unit-tests/client/test_no_tls_future.cpp	2016-07-27 06:14:20 +0000
+++ tests/unit-tests/client/test_no_tls_future.cpp	2016-08-03 06:51:52 +0000
@@ -118,7 +118,7 @@
 
     EXPECT_FALSE(called);
 
-    promise.set_value(std::move(std::string{expected}));
+    promise.set_value(std::string{expected});
     EXPECT_TRUE(called);
 }