diff --git a/lib/flatware/cli.rb b/lib/flatware/cli.rb
index 8d3a1b9..0c4ead1 100644
--- a/lib/flatware/cli.rb
+++ b/lib/flatware/cli.rb
@@ -3,6 +3,7 @@
 require 'thor'
 require 'flatware/pid'
 require 'etc'
+require 'fileutils'
 
 module Flatware
   # shared flatware cli
@@ -50,6 +51,8 @@ def clear
       (Flatware.pids - [Process.pid]).each do |pid|
         Process.kill 6, pid
       end
+
+      FileUtils.rm_f('flatware-sink')
     end
 
     private
diff --git a/lib/flatware/sink.rb b/lib/flatware/sink.rb
index 2788487..52eb1b9 100644
--- a/lib/flatware/sink.rb
+++ b/lib/flatware/sink.rb
@@ -6,6 +6,8 @@ module Flatware
   module Sink
     module_function
 
+    at_exit { DRb.stop_service }
+
     def start_server(**args)
       Server.new(**args).start
     end