Removed old code from merge.