Note replacement to deprecated methods and simplify them