Cleaning up the history