Brute cleanup to support Plone 3.x