Removed un-necessary providers/types.