* commit '3bc13da4814fa3020ada4707aee94156af0410fc': Remove or reduce visibility of deprecated methods