[#1557] Remove deprecation warnings