Cleaned Code

Added deleting capabilities to the calendar.  Took away the notification/alarm modularity.