refined deprecated with the help of martin thiede

Change-Id: If19c74bf31959126473de03efb1689c7346dad32