Removing unnecessary interface
Fixing bug in CalendarFilter