2.5 deprecated items update