remove 2 deprecation notices