pg: api cleanup