Uncomment debug logging and remove commented extern