Remove merge freak up.
Remove unused code.