Fixes leftovers from merge.