refactor deface overrides