Removed leftover lines from merge.