Hygiene: Remove unused schema

Change-Id: Ice8d1788d8e72736d878aa4647046bf204652a63
Merge "Hygiene: Remove unused schema"