clean a code a little

Change-Id: If42b7d886b1367e4e539c183e28b6b2071c649be
remove use of deprecated method

Change-Id: I418f6030344120306c10bea6773d586807ca1cb4