got rid of the history and swaps for now