Cleanup before merging to master.