Clean code after merge.