Remove contentprovider cruft.