Jconnor remove content providers

rebased to latest master before merge, same PR as last time