remove last big chunk of old api jank