Merge "Remove logging lines that are clogging up logs"