diff --git a/src/Makefile.am b/src/Makefile.am
index 9572872..5bdf85a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= $(all_includes)
 
 bin_PROGRAMS = kerberostray
 
-kerberostray_SOURCES = main.cpp toplevel.cpp tealist.cpp timeedit.cpp
+kerberostray_SOURCES = main.cpp toplevel.cpp
 
 kerberostray_METASOURCES = AUTO
 kerberostray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index 6e79055..d1caa0e 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -50,15 +50,9 @@
 #include <kaction.h>
 #include <knotifydialog.h>
 
-#include "tealist.h"
-#include "timeedit.h"
 #include "toplevel.h"
 #include "toplevel.moc"
 
-
-const int TopLevel::DEFAULT_TEA_TIME = 3*60;
-
-
 TopLevel::TopLevel() : KSystemTray()
 {
 	setBackgroundMode(X11ParentRelative);   // what for?
@@ -66,8 +60,7 @@ TopLevel::TopLevel() : KSystemTray()
 	KConfig *config = kapp->config();
 	config->setGroup("Kerberos");
 
-	confAct = new KAction(i18n("&Configure..."), "configure", 0,
-	                      TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure");
+	confAct = new KAction(i18n("&Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure");
 
 	// create app menu (displayed on right-click)
 	menu = new TQPopupMenu();
@@ -81,11 +74,6 @@ TopLevel::TopLevel() : KSystemTray()
 	confAct->plug(menu);
 	menu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu);
 	menu->insertItem(SmallIcon("exit"), i18n("Quit"), kapp, TQT_SLOT(quit()));
-
-	confdlg = 0L;
-	anondlg = 0L;
-
-	stop();                         // reset timer, disable some menu entries, etc.
 }
 
 /* slot: signal shutDown() from KApplication */
@@ -130,27 +118,13 @@ void TopLevel::mousePressEvent(TQMouseEvent *event)
 /** Handle paintEvent (ie. animate icon) */
 void TopLevel::paintEvent(TQPaintEvent *)
 {
-	TQPixmap *pm = &mugPixmap;
-
-	if (running) {
-		if (useTrayVis)
-			pm = &teaAnim1Pixmap;                            // this is 'mugPixmap' plus brown content
-		else
-			pm = &teaNotReadyPixmap;                         // generic "steeping" icon
-	} else {
-		// use simple two-frame "animation"
-		// FIXME: how about using a TQMovie instead? (eg. MNG)
-		if (ready) {
-			if (firstFrame)
-				pm = &teaAnim1Pixmap;
-			else
-				pm = &teaAnim2Pixmap;
-		}
-	}
+	TQPixmap *pm = &noTicketsPixmap;
+
+	// RAJA FIXME
 
 	TQPixmap base(*pm);                                      // make copy of base pixmap
 	TQPainter p(this);
-	p.drawPixmap(x, y, base);
+	p.drawPixmap(0, 0, base);
 	p.end();
 }
 
diff --git a/src/toplevel.h b/src/toplevel.h
index 38aeab3..37b75ee 100644
--- a/src/toplevel.h
+++ b/src/toplevel.h
@@ -57,9 +57,13 @@ protected:
 private slots:
 	void config();
 	void help();
+	void setToolTip(const TQString &text, bool force=false);
 
 private:
 	TQPixmap activeTicketsPixmap, noTicketsPixmap, expiredTicketsPixmap;
+	KAction *confAct;
+	TQPopupMenu *menu;
+	TQString lastTip;
 };
 
 #endif