Cleaned up @SuppressWarnings

Removed unused ones and added ones that are required.