--- a/usr/src/pkg/manifests/system-install-auto-install.mf	Tue May 31 11:07:18 2011 -0700
+++ b/usr/src/pkg/manifests/system-install-auto-install.mf	Tue May 31 14:21:09 2011 -0700
@@ -28,7 +28,6 @@
 set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=variant.arch value=$(ARCH)
 set name=variant.opensolaris.zone value=global
-user gcos-field="AI User" group=nobody uid=60003 ftpuser=false username="aiuser"
 dir path=etc group=sys
 dir path=etc/user_attr.d group=sys
 dir path=lib
@@ -41,45 +40,11 @@
 dir path=usr/sbin
 dir path=usr/lib
 dir path=usr/lib/install
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/solaris_install
-dir path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install
-dir path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/checkpoints
-dir path=usr/lib/python2.6/vendor-packages/solaris_install/manifest_input
-dir path=usr/share group=sys
-dir path=usr/share/auto_install group=sys
-file path=etc/user_attr.d/system%2Finstall%2Fauto-install group=sys
 file path=lib/svc/method/auto-installer mode=0555
 file path=lib/svc/method/manifest-locator mode=0555
-file path=usr/bin/ai_get_manifest mode=0555
 file path=usr/bin/ai_sd mode=0555
-file path=usr/bin/aimanifest mode=0555
-file path=usr/bin/auto-install mode=0555
 file path=usr/lib/install/sc_conv.ksh mode=0555
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/ai_parse_manifest.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/ai_parse_manifest.pyc mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/ai_instance.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/ai_instance.pyc mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/auto_install.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/auto_install.pyc mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/utmpx.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/utmpx.pyc mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/checkpoints/__init__.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/checkpoints/__init__.pyc mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/checkpoints/dmm.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/checkpoints/dmm.pyc mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/checkpoints/target_selection.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/checkpoints/target_selection.pyc mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/manifest_input/__init__.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/manifest_input/__init__.pyc mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/manifest_input/mim.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/manifest_input/mim.pyc mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/manifest_input/process_dtd.py mode=0444
-file path=usr/lib/python2.6/vendor-packages/solaris_install/manifest_input/process_dtd.pyc mode=0444
 file path=usr/sbin/get_manifest mode=0555
 file path=lib/svc/manifest/application/auto-installer.xml mode=0444 group=sys
 file path=lib/svc/manifest/application/manifest-locator.xml mode=0444 group=sys
 license cr_Sun license=cr_Sun
-link path=usr/lib/python2.6/vendor-packages/solaris_install/auto_install/ai_get_manifest.py target=../../../../../bin/ai_get_manifest
-