Clean up old-API code