Simplify remove-elc-on-save fn