Fix for calendar remove on undefined object

Cleanup method was attempting to remove datepicker regardless of whether
it existed or not; showCalendar false.