Remove more old apidb code