Cleanup and simplification for live link edits