Clean oa_core overrides