diff --git a/.stumpwmrc b/.stumpwmrc
index 3583e68..386da9c 100644
--- a/.stumpwmrc
+++ b/.stumpwmrc
@@ -9,8 +9,7 @@
   "Run BODY through emacsclient."
   `(sb-ext:run-program
    "/usr/bin/emacsclient"
-   '("-e"
-     ,(string-downcase (format nil "~S" (cons 'progn body))))
+   '("-e" ,(string-downcase (format nil "~S" (cons 'progn body))))
    :wait nil))
 
 ;; Naquadah
@@ -149,7 +148,6 @@ it and run *screen-unlocked-hook* after it has been unlocked."
 (setf *mode-line-foreground-color* (colour :lblack))
 (setf *shell-program* (getenv "SHELL"))
 (setf *transient-border-width* 1)
-(setf *window-format* "%m%50t")
 (setf *window-border-style* :thin)
 (setf *screen-mode-line-format*
       (list "[%n]"
@@ -158,10 +156,7 @@ it and run *screen-unlocked-hook* after it has been unlocked."
                (get-mail-count "ryuslash.org")
                (get-mail-count "gmail")
                (get-mail-count "aethon")
-               (get-mail-count "ninthfloor")))
-            '(:eval
-              (format-expand *window-formatters* *window-format*
-               (current-window)))))
+               (get-mail-count "ninthfloor")))))
 
 (add-hook *lock-screen-hook* 'set-jabber-away)
 (add-hook *lock-screen-hook* 'mpd-pause)