Fix to remove cal events