Deleted leftovers from merge