more deprecation removal