Stop usage of internal APIs