clean up after ourselves
removed some unused variables and imports
Merge branch 'tomgross-ptc' of git://github.com/plone/Products.Archetypes into tomgross-ptc