*refactoring - log deactivated