diff --git a/lib/homesick.rb b/lib/homesick.rb
index 4c8711c..f927744 100644
--- a/lib/homesick.rb
+++ b/lib/homesick.rb
@@ -155,7 +155,7 @@ class Homesick < Thor
           rm adjusted_path
         end
       end
-      rm_r castle_dir(name)
+      rm_rf repos_dir + name
     end
 
   end
diff --git a/lib/homesick/actions.rb b/lib/homesick/actions.rb
index 9d15c5a..6ea6402 100644
--- a/lib/homesick/actions.rb
+++ b/lib/homesick/actions.rb
@@ -78,12 +78,12 @@ class Homesick
 
     def rm(file)
       say_status "rm #{file}", '', :green unless options[:quiet]
-      system "rm #{file}"
+      system "rm #{file}" if File.exists?(file)
     end
 
-    def rm_r(dir)
-      say_status "rm -r #{dir}", '', :green unless options[:quiet]
-      system "rm -r #{dir}"
+    def rm_rf(dir)
+      say_status "rm -rf #{dir}", '', :green unless options[:quiet]
+      system "rm -rf #{dir}"
     end
 
     def ln_s(source, destination, config = {})