More removal of error suppression usage