Merge "Remove debug logging." into klp-dev