Remove deprecation warnings for now