Cleanup after new API rollout