Remove deprecation per discussion