REV: remove unnecessary code

Change-Id: I2dcd2c0b07e6a499ddbf4fcdfae824a2d778dfea