Fixing cruft left over from merge