Removed unused code.

Change-Id: If99a4565a18093a7b338f83aec049c3bd2ee088a