Remove private API usage