Clean it up before merging...