Refactoring the sweep method of NotificationManager so it takes no parameters.
merging in sweep-refactor