diff --git a/Gruntfile.js b/Gruntfile.js
index 73a029e37f..cf2501cb41 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -311,43 +311,18 @@ var path           = require('path'),
                 }
             },
 
-            // ### grunt-groc
-            // Generate documentation from code
-            groc: {
-                docs: {
-                    options: {
-                        out: './docs/',
-                        glob: [
-                            'README.md',
-                            'CONTRIBUTING.md',
-                            'SECURITY.md',
-                            'Gruntfile.js',
-                            'config.example.js',
-                            'index.js',
-                            'core/*.js',
-                            'core/server/**/*.js',
-                            'core/shared/**/*.js',
-                            'core/client/**/*.js'
-                        ],
-                        except: [
-                            '!core/**/vendor/**/*.js',
-                            '!core/client/tpl/**/*.js'
-                        ]
-                    }
-                }
-            },
-
             // ### grunt-docker
             // Generate documentation from code
             docker: {
                 docs: {
-                    dest: 'docks',
+                    dest: 'docs',
                     src: ['.'],
                     options: {
-                        exclude: 'node_modules,.git,.tmp,bower_components,content,*built,*test,*doc*,*vendor,config.js,coverage.html,.travis.yml',
+                        onlyUpdated: true,
+                        exclude: 'node_modules,.git,.tmp,bower_components,content,*built,*test,*doc*,*vendor,' +
+                            'config.js,coverage.html,.travis.yml,*.min.css,screen.css',
                         extras: ['fileSearch']
                     }
-
                 }
             },
 
@@ -621,7 +596,7 @@ var path           = require('path'),
 
         // ### Documentation
         // Run `grunt docs` to generate annotated source code using the documentation described in the code comments.
-        grunt.registerTask('docs', 'Generate Docs', ['docker', 'groc']);
+        grunt.registerTask('docs', 'Generate Docs', ['docker']);
 
 
         // ## Testing
@@ -850,7 +825,7 @@ var path           = require('path'),
             'Release task - creates a final built zip\n' +
             ' - Do our standard build steps (handlebars, etc)\n' +
             ' - Copy files to release-folder/#/#{version} directory\n' +
-            ' - Clean out unnecessary files (travis, .git*, .af*, .groc*)\n' +
+            ' - Clean out unnecessary files (travis, .git*, etc)\n' +
             ' - Zip files in release-folder to dist-folder/#{version} directory',
             ['shell:bower', 'handlebars', 'concat', 'uglify', 'clean:release', 'copy:release', 'compress:release']);
     };
diff --git a/package.json b/package.json
index 87fa9d19dd..d5fbbb0c19 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,6 @@
         "grunt-contrib-watch": "~0.5.3",
         "grunt-docker": "~0.0.8",
         "grunt-express-server": "~0.4.11",
-        "grunt-groc": "~0.4.5",
         "grunt-mocha-cli": "~1.4.0",
         "grunt-shell": "~0.6.1",
         "grunt-update-submodules": "~0.2.1",