Removing more rover/driver refs