removed calls to pg escape