do we really want to remove the logging?