diff --git a/.dotfiles b/.dotfiles
deleted file mode 120000
index 8527050..0000000
--- a/.dotfiles
+++ /dev/null
@@ -1 +0,0 @@
-.dotfiles
\ No newline at end of file
diff --git a/fish/fish/includes/alias.fish b/fish/fish/includes/alias.fish
index f4358fe..b41eaa6 100644
--- a/fish/fish/includes/alias.fish
+++ b/fish/fish/includes/alias.fish
@@ -17,12 +17,10 @@ alias b "bundle exec"
 # alias http "ruby -run -e httpd . -p5000"
 
 alias rails "bundle exec rails"
-alias rake "bundle exec rake"
 alias sidekiq "bundle exec sidekiq"
 alias rspec "bundle exec rspec"
 alias cucumber "bundle exec cucumber"
 alias cap "bundle exec cap"
-alias mina "bundle exec mina"
 alias foreman "bundle exec foreman"
 
 alias bd "bundle install --path=vendor/gems --jobs=8 --verbose"
@@ -31,8 +29,6 @@ alias rs "rails s"
 alias rs1 "rails s -p3001"
 alias rs2 "rails s -p3002"
 
-alias nano-console "ssh ins1.int.avs.io -t 'screen -r localhots'"
-
 # Git
 alias git "git-achievements"
 alias gl "git log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) %C(bold
diff --git a/fish/fish/includes/ruby.fish b/fish/fish/includes/ruby.fish
index a79b798..884c204 100644
--- a/fish/fish/includes/ruby.fish
+++ b/fish/fish/includes/ruby.fish
@@ -6,3 +6,19 @@ set -x RUBY_FREE_MIN 200000 # Deprecated since 2.1.0
 set -x RUBY_HEAP_SLOTS_INCREMENT 300000
 set -x RUBY_HEAP_SLOTS_GROWTH_FACTOR 1
 set -x RUBY_GC_MALLOC_LIMIT 79000000
+
+function mina
+    if test -e Gemfile
+        bundle exec mina $argv
+    else
+        /Users/chez/.rbenv/shims/mina $argv
+    end
+end
+
+function rake
+    if test -e Gemfile
+        bundle exec rake $argv
+    else
+        /Users/chez/.rbenv/shims/rake $argv
+    end
+end