diff --git a/source/YCPDialogParser.cc b/source/YCPDialogParser.cc
index 4864c6b..48c91e9 100644
--- a/source/YCPDialogParser.cc
+++ b/source/YCPDialogParser.cc
@@ -314,7 +314,6 @@ YCPDialogParser::parseWidgetTreeTerm( YWidget *		p,
     // Special widgets - may or may not be supported by the specific UI.
     // The YCP application should ask for presence of such a widget with Has???Widget() prior to creating one.
 
-    else if ( s == YUISpecialWidget_Date		)	w = parseDateField		( p, opt, term, ol, n );
     else if ( s == YUISpecialWidget_DateField		)	w = parseDateField		( p, opt, term, ol, n );
     else if ( s == YUISpecialWidget_DummySpecialWidget	)	w = parseDummySpecialWidget	( p, opt, term, ol, n );
     else if ( s == YUISpecialWidget_DownloadProgress	)	w = parseDownloadProgress	( p, opt, term, ol, n );
@@ -326,7 +325,6 @@ YCPDialogParser::parseWidgetTreeTerm( YWidget *		p,
     else if ( s == YUISpecialWidget_PatternSelector	)	w = parsePatternSelector	( p, opt, term, ol, n );
     else if ( s == YUISpecialWidget_SimplePatchSelector	)	w = parseSimplePatchSelector	( p, opt, term, ol, n );
     else if ( s == YUISpecialWidget_Slider		)	w = parseSlider			( p, opt, term, ol, n );
-    else if ( s == YUISpecialWidget_Time		)	w = parseTimeField		( p, opt, term, ol, n );
     else if ( s == YUISpecialWidget_TimeField		)	w = parseTimeField		( p, opt, term, ol, n );
     else if ( s == YUISpecialWidget_Wizard		)	w = parseWizard			( p, opt, term, ol, n );
     else if ( s == YUISpecialWidget_TimezoneSelector	)	w = parseTimezoneSelector	( p, opt, term, ol, n );
diff --git a/source/YCP_UI.cc b/source/YCP_UI.cc
index 19b89c2..4a3a929 100644
--- a/source/YCP_UI.cc
+++ b/source/YCP_UI.cc
@@ -108,9 +108,7 @@ YCPValue YCP_UI::HasSpecialWidget( const YCPSymbol & widget )
     else if ( symbol == YUISpecialWidget_PartitionSplitter	)	hasWidget = fact->hasPartitionSplitter();
     else if ( symbol == YUISpecialWidget_SimplePatchSelector	)	hasWidget = fact->hasSimplePatchSelector();
     else if ( symbol == YUISpecialWidget_Wizard			)	hasWidget = fact->hasWizard();
-    else if ( symbol == YUISpecialWidget_Date			)	hasWidget = fact->hasDateField();
     else if ( symbol == YUISpecialWidget_DateField)	hasWidget = fact->hasDateField();
-    else if ( symbol == YUISpecialWidget_Time)	hasWidget = fact->hasTimeField();
     else if ( symbol == YUISpecialWidget_TimeField)	hasWidget = fact->hasTimeField();
     else if ( symbol == YUISpecialWidget_TimezoneSelector	)	hasWidget = fact->hasTimezoneSelector();
     else if ( symbol == YUISpecialWidget_Graph			)	hasWidget = fact->hasGraph();