Task #14536 refactoring of removing unused items