Get rid of some hardcoded log messages