Cleanup repo E - order in flags