Added a working remove from calendar class