Remove DeprecationWarning