Remove unneded checks

Change-Id: I0379d747c5f903f2c0774abd16c61068e88d9ef6