Additional cleanup for editing customers