KAA-213: Cosmetic changes.
KAA-214: Fix log delivery timeout checking. Remove unused header.