Fixed

• Updates badge and shortcuts on app launch
• Improved clean up logic to better keep the order of tasks