Remove private functions