Merge "Remove unneeded logging"