diff --git a/MANIFEST b/MANIFEST
index 0c4f135ee..908e86076 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3,13 +3,6 @@ LICENSE
 MANIFEST
 README.txt
 TODO.txt
-example/execnet/popen_read_multiple.py
-example/genhtml.py
-example/genhtmlcss.py
-example/genxml.py
-example/pytest/failure_demo.py
-example/pytest/test_failures.py
-example/pytest/test_setup_flow_example.py
 ez_setup.py
 py/LICENSE
 py/__init__.py
@@ -83,41 +76,6 @@ py/compat/testing/test_subprocess.py
 py/compat/testing/test_textwrap.py
 py/compat/textwrap.py
 py/conftest.py
-py/doc/Makefile
-py/doc/__init__.py
-py/doc/bin.txt
-py/doc/code.txt
-py/doc/coding-style.txt
-py/doc/conf.py
-py/doc/confrest.py
-py/doc/contact.txt
-py/doc/download.txt
-py/doc/execnet.txt
-py/doc/img/pylib.png
-py/doc/impl-test.txt
-py/doc/index.txt
-py/doc/io.txt
-py/doc/links.txt
-py/doc/log.txt
-py/doc/make.bat
-py/doc/misc.txt
-py/doc/path.txt
-py/doc/release-0.9.0.txt
-py/doc/release-0.9.2.txt
-py/doc/release-1.0.0.txt
-py/doc/releases.txt
-py/doc/roles.py
-py/doc/style.css
-py/doc/test-config.txt
-py/doc/test-dist.txt
-py/doc/test-examples.txt
-py/doc/test-ext.txt
-py/doc/test-features.txt
-py/doc/test-plugins.txt
-py/doc/test-quickstart.txt
-py/doc/test-statemanage.txt
-py/doc/test.txt
-py/doc/xml.txt
 py/env.cmd
 py/env.py
 py/execnet/NOTES
diff --git a/README.txt b/README.txt
index 0914b90cf..5631ba97e 100644
--- a/README.txt
+++ b/README.txt
@@ -5,7 +5,6 @@ the following tools and modules:
 * py.execnet: ad-hoc distributed execution
 * py.code: dynamic code generation and introspection
 * py.path:  uniform local and svn path objects 
-* py.magic.greenlet: micro-threads
 
 It includes code and contributions from several people, 
 listed in the LICENSE file. 
@@ -18,4 +17,4 @@ have fun,
 
 holger krekel, holger at merlinux eu
 
-$Id: README.txt 63217 2009-03-23 00:59:18Z hpk $
+$Id: README.txt 63546 2009-04-02 17:34:16Z hpk $
diff --git a/TODO.txt b/TODO.txt
index 0c6bb30a1..21977fbdd 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,9 +1,6 @@
 Things to do for 1.0.0 
 ========================= 
 
-- ease building of py lib, only depend on python interp 
-  - separate py.magic.greenlet into its own project, and remove c-extension
-
 - scale down "magic" impressions & improve py.test: 
   - documentation entry points for users 
   - documentation entry points for extenders
diff --git a/setup.py b/setup.py
index cad836708..7f97c1805 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 """
     setup file for 'py' package based on:
 
-        https://codespeak.net/svn/py/trunk, revision=63519
+        https://codespeak.net/svn/py/trunk, revision=63545
 
     autogenerated by gensetup.py
 """
@@ -10,7 +10,7 @@ import os, sys
 import ez_setup
 ez_setup.use_setuptools()
 from setuptools import setup, Extension
-        
+            
 long_description = """
 
 The py lib is an extensible library for testing, distributed processing and 
@@ -72,7 +72,6 @@ def main():
                   'py.code.testing',
                   'py.compat',
                   'py.compat.testing',
-                  'py.doc',
                   'py.execnet',
                   'py.execnet.script',
                   'py.execnet.testing',
@@ -132,37 +131,6 @@ def main():
                              'compat/LICENSE',
                              'compat/testing/test_doctest.txt',
                              'compat/testing/test_doctest2.txt',
-                             'doc/Makefile',
-                             'doc/bin.txt',
-                             'doc/code.txt',
-                             'doc/coding-style.txt',
-                             'doc/contact.txt',
-                             'doc/download.txt',
-                             'doc/execnet.txt',
-                             'doc/img/pylib.png',
-                             'doc/impl-test.txt',
-                             'doc/index.txt',
-                             'doc/io.txt',
-                             'doc/links.txt',
-                             'doc/log.txt',
-                             'doc/make.bat',
-                             'doc/misc.txt',
-                             'doc/path.txt',
-                             'doc/release-0.9.0.txt',
-                             'doc/release-0.9.2.txt',
-                             'doc/release-1.0.0.txt',
-                             'doc/releases.txt',
-                             'doc/style.css',
-                             'doc/test-config.txt',
-                             'doc/test-dist.txt',
-                             'doc/test-examples.txt',
-                             'doc/test-ext.txt',
-                             'doc/test-features.txt',
-                             'doc/test-plugins.txt',
-                             'doc/test-quickstart.txt',
-                             'doc/test-statemanage.txt',
-                             'doc/test.txt',
-                             'doc/xml.txt',
                              'env.cmd',
                              'execnet/NOTES',
                              'execnet/improve-remote-tracebacks.txt',