Delete ResourceChangeListener; refactoring