Cleaned up the new providers