Eliminated deprecation warnings