Merge "Remove some excess logging and switch to protolog" into main