Code cleanup (remove extraneous suppression etc)
6 files changed