diff --git a/Gruntfile.js b/Gruntfile.js
index da71508..844ec02 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,25 +28,4 @@ module.exports = function (grunt) {
       }
     }
   });
-
-  // Custom task
-  grunt.registerTask('server', 'Warning: deprecated task "server"', function(){
-    grunt.log.warn('The `server` task has been deprecated. Use `grunt serve` to start a server.');
-    grunt.task.run(['serve']);
-  });
-
-  // Custom task
-  grunt.registerTask('serve', 'Start a localserver and serve the files', function (target) {
-    if (target === 'dist') {
-      return grunt.task.run(['build', 'connect:dist:keepalive']);
-    }
-    grunt.task.run([
-      'clean:server',
-      'doxication',
-      'assemble',
-      'concurrent:server',
-      'connect:livereload',
-      'watch'
-    ]);
-  });
 };
diff --git a/tasks/aliases.yml b/tasks/aliases.yml
index 62381b2..9064942 100644
--- a/tasks/aliases.yml
+++ b/tasks/aliases.yml
@@ -35,3 +35,15 @@ test:
   - 'concurrent:test'
   - 'connect:test'
   - 'jasmine'
+
+live:
+  - 'clean:server'
+  - 'doxication'
+  - 'assemble'
+  - 'concurrent:server'
+  - 'connect:livereload'
+  - 'watch'
+
+preview:
+  - 'build'
+  - 'connect:dist:keepalive'