cleanup; bugfix for PG