Remove use of experimental api's

Signed-off-by: Ryan Holder <ryan@ryanholder.com>