Remove surplus popups during Create, Save, Rename etc