Remove experimental api usage