diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java
index d5d1079f2..98b8f9fa9 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowser.java
@@ -94,7 +94,6 @@ public class AssetFolderBrowser extends Table {
 
         final GlobalizedMessage[] headers = {
             globalize("cms.ui.folder.name"),
-            globalize("cms.ui.folder.languages"),
             globalize("cms.ui.folder.title"),
             globalize("cms.ui.folder.type"),
             globalize("cms.ui.folder.creation_date"),
@@ -123,7 +122,7 @@ public class AssetFolderBrowser extends Table {
         getColumn(AssetFolderBrowserTableModel.COL_LAST_MODIFIED)
                 .setCellRenderer(new DateCellRenderer());
 
-        deleteColumn = getColumn(AssetFolderBrowserTableModel.COL_ACTION);
+        deleteColumn = getColumn(AssetFolderBrowserTableModel.COL_DELETEABLE);
         deleteColumn.setCellRenderer(new ActionCellRenderer());
         deleteColumn.setAlign("center");
 
@@ -334,7 +333,7 @@ public class AssetFolderBrowser extends Table {
                                       final Object key,
                                       final int row,
                                       final int column) {
-            if (((Boolean) value)) {
+            if ((!(Boolean) value)) {
                 return new Label(" ", false);
             } else {
                 final ControlLink link = new ControlLink(
diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowserTableModel.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowserTableModel.java
index 8ecaeb308..0d08f47ad 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowserTableModel.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetFolderBrowserTableModel.java
@@ -31,24 +31,23 @@ import java.util.List;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 class AssetFolderBrowserTableModel implements TableModel {
-    
+
     protected static final int COL_NAME = 0;
     protected static final int COL_TITLE = 1;
     protected static final int COL_TYPE = 2;
     protected static final int COL_CREATION_DATE = 3;
     protected static final int COL_LAST_MODIFIED = 4;
     protected static final int COL_DELETEABLE = 5;
-    protected static final int COL_ACTION = 6;
-    
+
     private final Iterator<AssetFolderBrowserTableRow> iterator;
     private AssetFolderBrowserTableRow currentRow;
 
     public AssetFolderBrowserTableModel(
-        final List<AssetFolderBrowserTableRow> rows) {
-        
+            final List<AssetFolderBrowserTableRow> rows) {
+
         iterator = rows.iterator();
     }
-    
+
     @Override
     public int getColumnCount() {
         return 6;
@@ -66,7 +65,7 @@ class AssetFolderBrowserTableModel implements TableModel {
 
     @Override
     public Object getElementAt(final int columnIndex) {
-        switch(columnIndex) {
+        switch (columnIndex) {
             case COL_NAME:
                 return currentRow.getName();
             case COL_TITLE:
@@ -88,7 +87,7 @@ class AssetFolderBrowserTableModel implements TableModel {
                 return currentRow.isDeletable();
             default:
                 throw new IllegalArgumentException(String.format(
-                    "Illegal column index %d.", columnIndex));
+                        "Illegal column index %d.", columnIndex));
         }
     }
 
@@ -99,13 +98,12 @@ class AssetFolderBrowserTableModel implements TableModel {
         } else {
             return String.format("item-%d", currentRow.getObjectId());
         }
-        
-        
+
 //        return currentRow.getObjectId();
     }
-    
+
     public boolean isFolder() {
         return currentRow.isFolder();
     }
-    
+
 }
diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserController.java
index 09a6b8370..a55b0a1f1 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserController.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserController.java
@@ -60,9 +60,6 @@ import javax.transaction.Transactional;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Path;
-import org.hibernate.tool.schema.internal.TargetFileImpl;
-import org.libreccm.categorization.ObjectNotAssignedToCategoryException;
-import org.libreccm.core.UnexpectedErrorException;
 import org.librecms.contentsection.FolderManager;
 
 import static org.librecms.CmsConstants.*;