Removed dead D7 code III