remove some redundant moves, make deleter match naming guidelines. Co-Authored-By: LC <[email protected]>