removes custom faces for diff
various changes