CallHistory and other cleanup