delete refactor remainder