Removed some unused files.

Change-Id: I607e950b11294ac7f71c26d609b76e4b72c1017c
Merge "Removed some unused files."