pg: API cleanup