Remove more stuff from fail merge