Cleaned up the Windows Phone provider classes.