removed unused (deprecated) import
added @SuppressWarnings where required.