Warnings before: 2816 after: 2590 (add: 6 del: 232)