Calendar group - Changes to delete function and better function naming

-Saher Talaat
-Bryan Patzke