Removing more db references
Removing default servers for now