Committing background service code
Calendar cleanup