Some debug logging removed