fix checkstyle for rest of util with suppressions

Why don't we remove the empty block?