removed duplicated code

Change-Id: I7ea9e38ae082cb88086c961cbb755d0f03a66640