diff --git a/UI/Common/bundle-info.plist b/UI/Common/bundle-info.plist
index 37a0405d2..dde2cfbdc 100644
--- a/UI/Common/bundle-info.plist
+++ b/UI/Common/bundle-info.plist
@@ -13,26 +13,10 @@
       { name = CommonUIProduct;       },
       { name = UIxComponent;          },
       { name = UIxPageFrame;          },
-      { name = UIxWinClose;           },
-      { name = UIxAppNavView;         },
-      { name = "UIxElemBuilder"; },
-      { name = "UIxTabView";          },
-      { name = "UIxTabItem";          },
     );
 
     WOComponents = (
       { name = UIxPageFrame;  },
-      { name = UIxWinClose;   },
-      { name = UIxAppNavView; },
-    );
-    
-    WOxElemBuilder = (
-      { name = "UIxElemBuilder"; },
-    );
-
-    WODynamicElements = (
-      { name = "UIxTabView";          },
-      { name = "UIxTabItem";          },
     );
   };
 }
diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile
index 7b76d73e9..b5d473102 100644
--- a/UI/SOGoUI/GNUmakefile
+++ b/UI/SOGoUI/GNUmakefile
@@ -17,7 +17,6 @@ libSOGoUI_HEADER_FILES +=	\
 	UIxJSClose.h		\
 	UIxComponent.h		\
 	SOGoAptFormatter.h	\
-	SOGoJSStringFormatter.h	\
 	WOContext+UIx.h		\
 
 libSOGoUI_OBJC_FILES +=		\
@@ -25,7 +24,6 @@ libSOGoUI_OBJC_FILES +=		\
 	UIxJSClose.m		\
 	UIxComponent.m		\
 	SOGoAptFormatter.m	\
-	SOGoJSStringFormatter.m \
 	WOContext+UIx.m		\
 	SOGoACLAdvisory.m \
 	SOGoFolderAdvisory.m
diff --git a/UI/SOGoUI/SOGoJSStringFormatter.h b/UI/SOGoUI/SOGoJSStringFormatter.h
deleted file mode 100644
index 3f02c5f64..000000000
--- a/UI/SOGoUI/SOGoJSStringFormatter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-  Copyright (C) 2000-2004 SKYRIX Software AG
-
-  This file is part of OGo
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: SOGoJSStringFormatter.h 415 2004-10-20 15:47:45Z znek $
-
-
-#ifndef	__SOGoJSStringFormatter_H_
-#define	__SOGoJSStringFormatter_H_
-
-
-#import <Foundation/Foundation.h>
-#include <NGExtensions/NSString+Escaping.h>
-
-@interface SOGoJSStringFormatter : NSObject <NGStringEscaping>
-{
-}
-
-+ (id)sharedFormatter;
-
-- (NSString *)stringByEscapingQuotesInString:(NSString *)_s;
-- (NSString *)stringByEscapingSingleQuotesInString:(NSString *)_s;
-- (NSString *)stringByEscapingDoubleQuotesInString:(NSString *)_s;
-
-@end
-
-#endif	/* __SOGoJSStringFormatter_H_ */
diff --git a/UI/SOGoUI/SOGoJSStringFormatter.m b/UI/SOGoUI/SOGoJSStringFormatter.m
deleted file mode 100644
index 59b3e72eb..000000000
--- a/UI/SOGoUI/SOGoJSStringFormatter.m
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-  Copyright (C) 2000-2004 SKYRIX Software AG
-
-  This file is part of OGo
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#import "SOGoJSStringFormatter.h"
-
-@implementation SOGoJSStringFormatter
-
-static NSCharacterSet *quotesSet = nil;
-static NSCharacterSet *squoteSet = nil;
-static NSCharacterSet *dquoteSet = nil;
-
-+ (void)initialize {
-  static BOOL didInit = NO;
-  
-  if(didInit)
-    return;
-  
-  didInit   = YES;
-  quotesSet = \
-    [[NSCharacterSet characterSetWithCharactersInString:@"'\""] retain];
-  squoteSet = \
-    [[NSCharacterSet characterSetWithCharactersInString:@"'"] retain];
-  dquoteSet = \
-    [[NSCharacterSet characterSetWithCharactersInString:@"\""] retain];
-}
-
-+ (id)sharedFormatter {
-  static id sharedInstance = nil;
-  if(!sharedInstance) {
-    sharedInstance = [[self alloc] init];
-  }
-  return sharedInstance;
-}
-
-- (NSString *)stringByEscapingQuotesInString:(NSString *)_s {
-  return [_s stringByEscapingCharactersFromSet:quotesSet
-             usingStringEscaping:self];
-}
-
-- (NSString *)stringByEscapingSingleQuotesInString:(NSString *)_s {
-  return [_s stringByEscapingCharactersFromSet:squoteSet
-             usingStringEscaping:self];
-}
-
-- (NSString *)stringByEscapingDoubleQuotesInString:(NSString *)_s {
-  return [_s stringByEscapingCharactersFromSet:dquoteSet
-             usingStringEscaping:self];
-}
-
-- (NSString *)stringByEscapingString:(NSString *)_s {
-  if([_s isEqualToString:@"'"]) {
-    return @"&amp;apos;";
-  }
-  return @"&amp;quot;";
-}
-
-@end