cleanup extra remove functionality from calendar