Final DB edits to remove most debug logging