Update formats/rules

- Reverted ac3c83e8b11461c8be51bf02fd8d63b435f9f574
- Added new clauses to OMs that follow OU