Clean up before merge to master.