Removing psycopg2 requirement