Use Container for everything
Remove plone 3 note