Making history persistant
Cleanup