Removed all custom logging