Polish the mgmt code
Remove on_commit handlers