If you upgrade your site to xenForo 2.0.10 to clear the outdated templates simply merge the PAGE_CONTAINER template.
Since I don't make any major changes to any of the templates merging the templates makes it very easy to upgrade without losing the customizations.
