Remove internal API usage