Extra Clean-up

Change-Id: Ibd931125d7ed41637c1d766b1f5bdd52147b745e