Remove ApiV2 and other cruft