Remove warnings for expected deprecation usage