Fixed issues after removing GroundDB