More clean up - trying to disable all the content presenters as suggested on the MS forums has helped here