Logging improvements
Removed old provider code