Remove usage of internal API