Refactorin deleting Calendar dependencies on Alarm entity