Safe to remove these w.r.t. the recent changes in 7828.