Additional conflict fixes and removing some unneeded files.