Remoove some clutter

Change-Id: Ic02b60ceb7833be749cf62eb54d1f152eabe2dc7