Double performance?
Fix some issues with LOGGING not being removed