diff --git a/Gruntfile.js b/Gruntfile.js
index c0250a6..8824738 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,8 +2,6 @@ module.exports = function(grunt) {
   require('load-grunt-tasks')(grunt);
   var path = require('path');
   
-  grunt.loadNpmTasks('grunt-string-replace');
-  
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     pkgMeta: grunt.file.readJSON('config/meta.json'),
@@ -123,7 +121,7 @@ module.exports = function(grunt) {
       },
       assets: {
         cwd: 'assets/',
-        src: ['logo_50.png'],
+        src: ['*.*'],
         dest: '<%= basePath %>/assets',
         expand: true
       },
diff --git a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
index cbf4937..3d49e8e 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValue.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Archetype.Models
@@ -12,6 +13,7 @@ namespace Archetype.Models
         public bool StartWithAddButton { get; set; }
 
         [JsonProperty("hideFieldsetToolbar")]
+        [Obsolete("This value is no longer used but is kept to prevent breaking changes.")]
         public bool HideFieldsetToolbar { get; set; }
 
         [JsonProperty("enableMultipleFieldsets")]
diff --git a/app/views/archetype.config.fieldset.dialog.html b/app/views/archetype.config.fieldset.dialog.html
index 98b3be0..1c263ab 100644
--- a/app/views/archetype.config.fieldset.dialog.html
+++ b/app/views/archetype.config.fieldset.dialog.html
@@ -27,9 +27,6 @@
         <div>
             <label for="archetypeAdvancedOptionsDisabling"><input type="checkbox" id="archetypeAdvancedOptionsDisabling" ng-model="model.enableDisabling" /><archetype-localize key="enableDisabling">Enable Fieldset Disabling?</archetype-localize><small><archetype-localize key="enableDisablingDescription">Allows fieldsets to be individually enabled/disabled.</archetype-localize></small></label>
         </div>
-        <div>
-            <label for="archetypeAdvancedOptionsFieldsetToolbar"><input type="checkbox" id="archetypeAdvancedOptionsFieldsetToolbar" ng-model="model.hideFieldsetToolbar"/><archetype-localize key="hideFieldsetToolbar">Hide Fieldset Toolbar?</archetype-localize><small><archetype-localize key="hideFieldsetToolbarDescription">Hides the fieldset toolbar that appears when more than one fieldset model appears.</archetype-localize></small></label>
-        </div>
         
         <h4><archetype-localize key="multipleFieldsets">Multiple fieldsets</archetype-localize></h4>
         <div>