[DO NOT MERGE] oo-admin-repair refactor

Added repair for usage inconsistencies