Removed more un-necessary types/providers.