Cleaned up unused code.

Change-Id: I27ba357bc654175136ab7a2505a23eda4569fde6