Clean up deletion logging messages and move to a method