Cleaned up the .Net provider classes.