removed another two deprecation errors