Quick cleanup
Added suppressions back
Merge pull request #763 from lexware/master

Quick cleanup