Index: shell/main.c
===================================================================
--- shell/main.c	(revision 33305)
+++ shell/main.c	(working copy)
@@ -565,7 +565,6 @@ main (int argc, char **argv)
 	glade_init ();
 	e_cursors_init ();
 	e_icon_factory_init ();
-	e_passwords_init();
 
 	gtk_window_set_default_icon_name ("evolution");
 
Index: mail/mail-session.c
===================================================================
--- mail/mail-session.c	(revision 33305)
+++ mail/mail-session.c	(working copy)
@@ -681,8 +681,6 @@ mail_session_set_interactive (gboolean i
 		
 		d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n"));
 
-		e_passwords_cancel();
-		
 		/* flush/cancel pending user messages */
 		while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) {
 			d(printf ("Flusing message request: %s\n", um->prompt));
Index: calendar/gui/alarm-notify/notify-main.c
===================================================================
--- calendar/gui/alarm-notify/notify-main.c	(revision 33305)
+++ calendar/gui/alarm-notify/notify-main.c	(working copy)
@@ -169,7 +169,6 @@ main (int argc, char **argv)
 
 	alarm_done ();
 
-	e_passwords_shutdown ();
 	gnome_sound_shutdown ();
 
 	return 0;
