Hygiene: Remove unused files

Change-Id: I52f5a5c17c6341822b3bacf93f0f215379da5728
Merge "Hygiene: Remove unused files"