Merge "Cleanup form for history"