HistoryProxy cleaned up