Cleaning up the zk/history merge