Remove some redundant warning suppression