Removed other useless code from merging.