I think we need to also clean out the contentstore in case anything was imported or created there.