Clean up commit for merge with master.