Removed unnecessary setup
Moved self.calculate_push_dates into app