Remove @SuppressWarnings that are Unneeded