Remove internal functions from public scope