finish up the delete refactor