We should ditch these leftover comments too.