Remove commented code
Don't persist broker/catalog changes when update fails

[Finishes #62008174]