Code refactoring and disable logging for provider modules