[#1500] Remove @deprecated methods