Fixed those used by 7.x. The others will be removed in the cleanup phase.