Removed some unnecessary @SuppressWarnings("deprecation") lines from imp classes