Removed unused references from Consumer and Provider to make it easier to get a fresh download to run.