#760 code refactoring: 1.move all daily specific logic to a category 2. delete legacy code