Minor: Removed dead code

Change-Id: I177d1e1ce2c1dc9e3666996e120b46811c3f6e55