remove lots more old api jank