Move delete to end of script to avoid merge conflict with future changes