diff --git a/phone/com/android/internal/policy/impl/LockScreen.java b/phone/com/android/internal/policy/impl/LockScreen.java
index 1eb2747..43e1557 100644
--- a/phone/com/android/internal/policy/impl/LockScreen.java
+++ b/phone/com/android/internal/policy/impl/LockScreen.java
@@ -180,7 +180,6 @@
         }
 
         mCarrier = (TextView) findViewById(R.id.carrier);
-        mTime = (TextView) findViewById(R.id.time);
         mDate = (TextView) findViewById(R.id.date);
         mStatus1 = (TextView) findViewById(R.id.status1);
         mStatus2 = (TextView) findViewById(R.id.status2);
@@ -371,7 +370,6 @@
 
     private void refreshTimeAndDateDisplay() {
         Date now = new Date();
-        mTime.setText(mTimeFormat.format(now));
         mDate.setText(mDateFormat.format(now));
     }
 
diff --git a/phone/com/android/internal/policy/impl/UnlockScreen.java b/phone/com/android/internal/policy/impl/UnlockScreen.java
index a5032b3..2843dd4 100644
--- a/phone/com/android/internal/policy/impl/UnlockScreen.java
+++ b/phone/com/android/internal/policy/impl/UnlockScreen.java
@@ -72,9 +72,7 @@
     private boolean mCreatedInPortrait;
 
     private TextView mCarrier;
-    private TextView mCenterDot;
     private TextView mDate;
-    private TextView mTime;
 
     // are we showing battery information?
     private boolean mShowingBatteryInfo = false;
@@ -169,11 +167,8 @@
         }
 
         mCarrier = (TextView) findViewById(R.id.carrier);
-        mCenterDot = (TextView) findViewById(R.id.centerDot);
         mDate = (TextView) findViewById(R.id.date);
-        mTime = (TextView) findViewById(R.id.time);
 
-        mCenterDot.setText("|");
         refreshTimeAndDateDisplay();
 
         mStatus1 = (TextView) findViewById(R.id.status1);
@@ -323,7 +318,6 @@
 
     private void refreshTimeAndDateDisplay() {
         Date now = new Date();
-        mTime.setText(DateFormat.getTimeFormat(getContext()).format(now));
         mDate.setText(DateFormat.getMediumDateFormat(getContext()).format(now));
     }
 
