Removed the last two deprecation warnings.