Removed old debug logging
Added policy