Removing @SuppressWarnings