Re #6516 Get rid of API v1 code