diff --git a/Gruntfile.js b/Gruntfile.js
index cf8bd315a..2198d7688 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,4 @@
-/*global __dirname, process */
+/*global process */
 module.exports = function(grunt) {
     var path = require('path');
     grunt.initConfig({
@@ -21,21 +21,6 @@ module.exports = function(grunt) {
                 },
             }
         },
-
-        json: {
-            main: {
-                options: {
-                    namespace: 'locales',
-                    includePath: true,
-                    processName: function(filename) {
-                        return filename.toLowerCase().match(/^locale\/(.*)\/lc_messages/)[1];
-                    }
-                },
-                src: ['locale/**/LC_MESSAGES/*.json'],
-                dest: 'builds/locales.js'
-            }
-        },
-
         cssmin: {
             options: {
                 banner: "/*"+
@@ -49,49 +34,12 @@ module.exports = function(grunt) {
                 dest: 'css/converse.min.css',
                 src: ['css/converse.css']
             }
-        },
-        touch: {
-            npm: ['stamp-npm'],
-            bower: ['stamp-bower']
         }
     });
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-jst');
     grunt.loadNpmTasks('grunt-json');
     grunt.loadNpmTasks('grunt-contrib-requirejs');
-    grunt.loadNpmTasks('grunt-touch');
-
-    grunt.registerTask('test', 'Run Tests', function () {
-        var done = this.async();
-        var child_process = require('child_process');
-        var exec = child_process.exec;
-        exec('./node_modules/.bin/phantomjs '+
-             'node_modules/jasmine-reporters/test/phantomjs-testrunner.js '+
-             __dirname+'/tests.html',
-             function (err, stdout, stderr) {
-                if (err) {
-                    grunt.log.write('Tests failed with error code '+err.code);
-                    grunt.log.write(stderr);
-                }
-                grunt.log.write(stdout);
-                done();
-        });
-    });
-
-    grunt.registerTask('fetch', 'Set up the development environment', function () {
-        var done = this.async();
-        var child_process = require('child_process');
-        var exec = child_process.exec;
-        exec('./node_modules/.bin/bower update',
-             function (err, stdout, stderr) {
-                if (err) {
-                    grunt.log.write('build failed with error code '+err.code);
-                    grunt.log.write(stderr);
-                }
-                grunt.log.write(stdout);
-                done();
-        });
-    });
 
     grunt.registerTask('jsmin', 'Create a new release', function () {
         var done = this.async();
diff --git a/docs/RELEASE_CHECKLIST.txt b/docs/RELEASE_CHECKLIST.txt
index 0dc0f17f0..c2c202a82 100644
--- a/docs/RELEASE_CHECKLIST.txt
+++ b/docs/RELEASE_CHECKLIST.txt
@@ -1,9 +1,7 @@
 - Run tests
-    grunt test
-- Bump version
-    make bump VERSION=0.6.4
-- Re-minify CSS and JS
-    grunt release
+    make check
+- make the release
+    make release VERSION=0.6.4
 - Tag
     git tag -s v0.6.4 -m 'Release of version 0.6.4'
 - Push
diff --git a/spec/chatroom.js b/spec/chatroom.js
index aacbc593c..304516f83 100644
--- a/spec/chatroom.js
+++ b/spec/chatroom.js
@@ -71,7 +71,6 @@
                 // http://xmpp.org/extensions/xep-0045.html#exit
                 for (i=mock.chatroom_names.length-1; i>-1; i--) {
                     name = mock.chatroom_names[i];
-                    console.log(name);
                     role = mock.chatroom_roles[name].role;
                     // See example 21 http://xmpp.org/extensions/xep-0045.html#enter-pres
                     presence = $pres({
diff --git a/tests/main.js b/tests/main.js
index 350b88454..1d96d55cb 100644
--- a/tests/main.js
+++ b/tests/main.js
@@ -47,7 +47,7 @@ require([
             animate: false,
             connection: mock.mock_connection,
             no_trimming: true,
-            debug: true
+            debug: false
         }, function (converse) {
             window.converse = converse;
             window.crypto = {