diff --git a/ActiveSync/NSData+ActiveSync.m b/ActiveSync/NSData+ActiveSync.m
index 670474240..3c6601fbf 100644
--- a/ActiveSync/NSData+ActiveSync.m
+++ b/ActiveSync/NSData+ActiveSync.m
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <wbxml/wbxml_conv.h>
 #include <wbxml/wbxml_errors.h>
 
-#define WBXMLDEBUG 1
+#define WBXMLDEBUG 0
 
 @implementation NSData (ActiveSync)
 
diff --git a/ActiveSync/NSDate+ActiveSync.h b/ActiveSync/NSDate+ActiveSync.h
index 60c3e9a72..172552470 100644
--- a/ActiveSync/NSDate+ActiveSync.h
+++ b/ActiveSync/NSDate+ActiveSync.h
@@ -36,7 +36,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 @interface NSDate (ActiveSync)
 
-+ (NSDate *) dateFromFilterType: (NSString *) theFilterType;
 - (NSString *) activeSyncRepresentation;
 
 @end
diff --git a/ActiveSync/NSDate+ActiveSync.m b/ActiveSync/NSDate+ActiveSync.m
index 9139ff86a..58de5b6ab 100644
--- a/ActiveSync/NSDate+ActiveSync.m
+++ b/ActiveSync/NSDate+ActiveSync.m
@@ -32,58 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
-#define ONE_DAY 86400
-
 @implementation NSDate (ActiveSync)
 
-//
-// See http://msdn.microsoft.com/en-us/library/gg709713(v=exchg.80).aspx for available types
-//
-+ (NSDate *) dateFromFilterType: (NSString *) theFilterType
-{
-  NSDate *d;
-
-  d = [self alloc];
-
-  if (d)
-    {
-      int value;
-      
-      switch ([theFilterType intValue])
-        {
-        case 1:
-          value = ONE_DAY;
-          break;
-        case 2:
-          value = 3 * ONE_DAY;
-          break;
-        case 3:
-          value = 7 * ONE_DAY;
-          break;
-        case 4:
-          value = 14 * ONE_DAY;
-          break;
-        case 5:
-          value = 30 * ONE_DAY;
-          break;
-        case 6:
-          value = 90 * ONE_DAY;
-          break;
-        case 7:
-          value = 180 * ONE_DAY;
-          break;
-        case 0:
-        case 8:
-        default:
-          return nil;
-        }
-
-      return [d initWithTimeIntervalSinceNow: -value];
-    }
-
-  return d;
-}
-
 - (NSString *) activeSyncRepresentation
 {
   return [self descriptionWithCalendarFormat: @"%Y%m%dT%H%M%SZ"  timeZone: [NSTimeZone timeZoneWithName: @"GMT"]  locale: nil];