refactoring #2 remove deleted