Clean up redundancies

Change-Id: Icaf04c80dd98c5da93f2f8fd48451f24e7a2d9f5