remove postgres optimization for now