Removing unused code + little cleanup.

Change-Id: I81c19a8f19cfb5c7183609656ade833d72feb500
5 files changed