Cleanup: added missing annotations, removed unnecesary annotations
Merge pull request #1757 from akarnokd/Cleanup_Override_n_SuppressWarnings

Cleanup: added missing annotations, removed unnecesary annotations