refactoring remove null