removing cruft from merge snafu