Code cleanup in client. calendar_popover left remaining.