More history cleanups