More cleanup; DB location link