Removed deprecation warnings.