Minor cleanups to use logger.
Remove "TODO" entries that will never need to be done because of the profile we're using.