Remove redundant calls to message