diff --git a/elpa-to-submit/osx-plist.el b/elpa-to-submit/osx-plist.el
deleted file mode 100644
index 139e3ae652..0000000000
--- a/elpa-to-submit/osx-plist.el
+++ /dev/null
@@ -1,108 +0,0 @@
-;;; osx-plist.el --- Apple plist file parser
-
-;; Copyright (C) 2005  Edward O'Connor <ted@oconnor.cx>
-
-;; Author: Edward O'Connor <ted@oconnor.cx>
-;; Keywords: convenience
-
-;; This file is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
-;; later version.
-
-;; This file is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
-
-;;; Commentary:
-
-;; Simple parser for Mac OS X plist files. The main entry point is
-;; `osx-plist-parse-file' (which see). As a useful example, code is
-;; included to update Emacs' environment by parsing your
-;; ~/.MacOSX/environment.plist file (see `osx-plist-update-environment').
-
-;;; Code:
-
-(require 'xml)
-
-;; Placate the byte compiler and elint
-(defvar exec-path)
-
-(defvar osx-env-file "~/.MacOSX/environment.plist"
-  "File in which Mac OS X stores your environment.")
-
-(defun osx-plist-process-array (xml)
-  "Process the plist array element XML."
-  (let ((real-children (list)))
-    (mapc (lambda (child)
-            (when (not (stringp child))
-              (push (osx-plist-node-value child) real-children)))
-          (xml-node-children xml))
-    (apply 'vector (nreverse real-children))))
-
-(defun osx-plist-process-dict (xml)
-  "Place the key-value pairs of plist XML into HASH."
-  (let ((hash (make-hash-table :test 'equal))
-        (current-key nil))
-    (mapc
-     (lambda (child)
-       (when (not (stringp child)) ; ignore inter-tag whitespace
-         (let ((name (xml-node-name child))
-               (children (xml-node-children child)))
-           (if (eq name 'key)
-               (setq current-key (osx-plist-node-value child))
-             (puthash current-key
-                      (osx-plist-node-value child)
-                      hash)))))
-     (xml-node-children xml))
-    hash))
-
-(defun osx-plist-node-value (node)
-  "Return a Lisp value equivalent of plist node NODE."
-  (let ((name (xml-node-name node))
-        (children (xml-node-children node)))
-    (cond ((eq name 'false) nil)
-          ((eq name 'true)  t)
-          ((memq name '(key string))
-           (apply 'concat children))
-          ((eq name 'dict)
-           (osx-plist-process-dict node))
-          ((eq name 'array)
-           (osx-plist-process-array node)))))
-
-(defun osx-plist-p (xml)
-  "Non-null if XML appears to be an Apple plist."
-  (and xml (listp xml) (eq (xml-node-name xml) 'plist)))
-
-(defun osx-plist-parse-file (file)
-  "Parse the plist file FILE into an elisp hash table."
-  (let ((xml (car (xml-parse-file file))))
-    (when (osx-plist-p xml)
-      (osx-plist-node-value (car (xml-get-children xml 'dict))))))
-
-;; Example code: initialize Emacs' environment based on your
-;; environment.plist.
-
-(defun osx-plist-update-exec-path ()
-  "Update `exec-path' from the PATH environment variable."
-  (let ((path (getenv "PATH")))
-    (mapc (lambda (dir)
-            (add-to-list 'exec-path dir))
-          (parse-colon-path path)))
-  exec-path)
-
-(defun osx-plist-update-environment ()
-  "Load environment variables in `osx-env-file' into Emacs' environment."
-  (let ((plist (osx-plist-parse-file osx-env-file)))
-    (maphash 'setenv plist)
-    (when (gethash "PATH" plist)
-      (osx-plist-update-exec-path))))
-
-(provide 'osx-plist)
-;;; osx-plist.el ends here
diff --git a/starter-kit-misc.el b/starter-kit-misc.el
index 0de9e5d931..5df5af0587 100644
--- a/starter-kit-misc.el
+++ b/starter-kit-misc.el
@@ -124,14 +124,10 @@
 ;; Platform-specific stuff
 (when (eq system-type 'darwin)
   ;; Work around a bug on OS X where system-name is FQDN
-  (setq system-name (car (split-string system-name "\\.")))
-  ;; Work around a bug where environment variables aren't set correctly
-  (require 'osx-plist)
-  (when (file-exists-p "~/.MacOSX/environment.plist")
-    (osx-plist-update-environment)))
+  (setq system-name (car (split-string system-name "\\."))))
 
 ;; make emacs use the clipboard
 (setq x-select-enable-clipboard t)
 
 (provide 'starter-kit-misc)
-;;; starter-kit-misc.el ends here
\ No newline at end of file
+;;; starter-kit-misc.el ends here