Cleanuped after merge.