NOJIRA:  Clean up some unused imports and an unnecessary @SuppressWarnings