diff --git a/src/main/java/com/bradley/gwt/user/client/resource/CancelButtonResources.java b/src/main/java/com/bradley/gwt/user/client/resource/CancelButtonResources.java
deleted file mode 100644
index 1392aac..0000000
--- a/src/main/java/com/bradley/gwt/user/client/resource/CancelButtonResources.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.bradley.gwt.user.client.resource;
-
-import com.google.gwt.resources.client.ImageResource;
-
-public interface CancelButtonResources extends IconButtonResources {
-
-	public interface CancelStyle extends IconStyle {}
-	
-	@Source("icon-button.css")
-	CancelStyle style();
-	
-	@Source("image/cancel.png")
-	ImageResource icon();
-}
diff --git a/src/main/java/com/bradley/gwt/user/client/resource/ExportButtonClientBundle.java b/src/main/java/com/bradley/gwt/user/client/resource/ExportButtonClientBundle.java
deleted file mode 100644
index 4e19ec4..0000000
--- a/src/main/java/com/bradley/gwt/user/client/resource/ExportButtonClientBundle.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.bradley.gwt.user.client.resource;
-
-import com.google.gwt.resources.client.ImageResource;
-
-public interface ExportButtonClientBundle extends IconButtonResources {
-
-public interface ExportStyle extends IconStyle {}
-	
-	@Source("icon-button.css")
-	ExportStyle style();
-	
-	@Source("image/blue-document-excel.png")
-	ImageResource icon();
-}
diff --git a/src/main/java/com/bradley/gwt/user/client/resource/RemoveButtonResources.java b/src/main/java/com/bradley/gwt/user/client/resource/RemoveButtonResources.java
deleted file mode 100644
index b654577..0000000
--- a/src/main/java/com/bradley/gwt/user/client/resource/RemoveButtonResources.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.bradley.gwt.user.client.resource;
-
-import com.google.gwt.resources.client.ImageResource;
-
-public interface RemoveButtonResources extends IconButtonResources {
-
-	public interface RemoveStyle extends IconStyle {}
-	
-	@Source("icon-button.css")
-	RemoveStyle style();
-	
-	@Source("image/delete.png")
-	ImageResource icon();
-}
diff --git a/src/main/java/com/bradley/gwt/user/client/resource/SearchButtonClientBundle.java b/src/main/java/com/bradley/gwt/user/client/resource/SearchButtonClientBundle.java
deleted file mode 100644
index 9b266e1..0000000
--- a/src/main/java/com/bradley/gwt/user/client/resource/SearchButtonClientBundle.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.bradley.gwt.user.client.resource;
-
-import com.google.gwt.resources.client.ImageResource;
-
-public interface SearchButtonClientBundle extends IconButtonResources {
-
-	public interface SearchButtonStyle extends IconStyle {}
-
-	@Source("icon-button.css")
-	SearchButtonStyle style();
-	
-	@Override
-	@Source("image/magnifier.png")
-	ImageResource icon();
-}
diff --git a/src/main/java/com/bradley/gwt/user/client/ui/DateBox.java b/src/main/java/com/bradley/gwt/user/client/ui/DateBox.java
deleted file mode 100644
index ca63562..0000000
--- a/src/main/java/com/bradley/gwt/user/client/ui/DateBox.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.bradley.gwt.user.client.ui;
-
-import java.util.Date;
-import java.util.logging.Logger;
-
-import com.bradley.gwt.user.client.i18n.UIConstants;
-import com.google.gwt.core.client.Scheduler;
-import com.google.gwt.core.client.Scheduler.ScheduledCommand;
-import com.google.gwt.editor.client.LeafValueEditor;
-import com.google.gwt.event.dom.client.BlurHandler;
-import com.google.gwt.event.dom.client.ChangeHandler;
-import com.google.gwt.event.dom.client.FocusHandler;
-import com.google.gwt.event.dom.client.HasAllFocusHandlers;
-import com.google.gwt.event.logical.shared.ValueChangeEvent;
-import com.google.gwt.event.logical.shared.ValueChangeHandler;
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.i18n.client.DateTimeFormat;
-import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
-import com.google.gwt.user.client.Element;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.HasValue;
-
-/**
- * A form field that has date values. This widget is enhanced with jquery date
- * picker. It also supports i18n through setting a DateTimeFormat.
- */
-public class DateBox extends Composite implements HasValue<Date>, HasAllFocusHandlers, LeafValueEditor<Date> {
-
-	protected DateTimeFormat format = DateTimeFormat.getFormat(PredefinedFormat.DATE_SHORT);
-	
-	protected TextBox textbox;
-	
-	private static final Logger LOG = Logger.getLogger(DateBox.class.getName());
-	
-	private static final UIConstants constants = UIConstants.INSTANCE;
-	
-	public DateBox() {
-		textbox = new TextBox();
-		textbox.setEmptyText(constants.chooseDateDotDotDot());
-		initWidget(textbox);
-		
-		Scheduler.get().scheduleDeferred(new ScheduledCommand() {
-
-			@Override
-			public void execute() {
-				enhance(textbox.getElement(), getJsPattern());
-			}
-		});
-	}
-	
-	public void setFormat(DateTimeFormat format) {
-		this.format = format;
-		setFormat(textbox.getElement(), getJsPattern());
-	}
-	
-	@Override
-	public Date getValue() {
-		String value = textbox.getValue();
-		
-		if (value == null || value.isEmpty()) {
-			return null;
-		}
-		
-		try {
-			Date d = format.parse(value);
-			return d;
-		} catch (Exception e) {
-			LOG.warning("Users date was invalid: " + value);
-			return null;
-		}
-	}
-
-	@Override
-	public void setValue(Date value) {
-		if (value == null) {
-			textbox.setValue("");
-			return;
-		}
-		
-		textbox.setValue(format.format(value), true);
-	}
-
-	@Override
-	public void setValue(Date value, boolean fireEvents) {
-		setValue(value);		
-	}
-	
-	public HandlerRegistration addChangeHandler(ChangeHandler handler) {
-		return textbox.addChangeHandler(handler);
-	}
-	
-	@Override
-	public HandlerRegistration addValueChangeHandler(
-			ValueChangeHandler<Date> handler) {
-		
-		return textbox.addHandler(handler, ValueChangeEvent.getType());
-	}
-	
-	/**
-	 * Get the JS pattern for the date time format. JS date formats differ slightly
-	 * so this method transcodes the format from Java style to JS style.
-	 * 
-	 * Note that its functionality is very limited. Currently we only handle year
-	 * properties.
-	 * 
-	 * @return The JS style date format
-	 */
-	protected String getJsPattern() {
-		String pattern = format.getPattern();
-		pattern = pattern.replaceAll("M", "m");
-		return pattern.replaceAll("yyyy", "yy");
-	}
-	
-	private static native void enhance(Element el, String format)/*-{
-		$wnd.$(el).datepicker({dateFormat: format});
-	}-*/;
-	
-	private static native void setFormat(Element el, String format)/*-{
-		$wnd.$(el).datepicker('option', 'dateFormat', format);
-	}-*/;
-
-	@Override
-	public HandlerRegistration addFocusHandler(FocusHandler handler) {
-		return textbox.addFocusHandler(handler);
-	}
-
-	@Override
-	public HandlerRegistration addBlurHandler(BlurHandler handler) {
-		return textbox.addBlurHandler(handler);
-	}
-}